Multiple commits to the branch

Summary:

Hi Experts,

Our team has performed a change in local branch LB1 and moved the change (Commit and Push) to the prod staging branch which is used for lower environments. During UAT, few changes were suggested and team created a new branch LB2 with prod staging branch as base branch and made the changes to the same page and pushed it to prod staging branch. Now when we are trying to cherry pick the change to commit to main branch, It is showing error message as conflicts and cannot be merged. The issue is occurring when the changes are performed in the