1.Checkout to the branch: git checkout 6668a90 2.Merge the branch: git merge remotes/origin/dev 3.Resolve conflicts manually. 4.Push the code: git push origin HEAD:qa-team/khachane/FDEV-2813-overview-reports 5.Checkout to the branch: git checkout qa-team/khachane/FDEV-2813-overview-reports 6.Verify the local branch is updated: git pull origin dev