Git merge remote branch causing conflicts with same branch

Question

I am following the below process for the git merge.
I have two branches.

• Branch A
• Brnach B

I do changes in Branch A and push to Branch