My gitlab setup has an orphan branch that was created from master. after changing the files in orphan branch, I try to merge back to master, but all the files are showing merge conflict. I need someone to show me how to successfully merge changes from orphan branch back to master without having to manually resolve conflict. Maybe by rebasing? Pls bid if you have good experience with git, and you can confidently fix this issue. You can try it out on your own to verify it works so we don't go back and forth. Need done ASAP. thx.