Hi
Gone through your requirement. I am expert in Git, SSH git and GItlab/Github. Therefore, i think i can help you with your required task.
I know how to fix this merge issue, you just let me know did you hit pull request or not?
Waiting for your reply.
Regards
Usama Ayaz