Help to solve conflict

I have pull requests and I want help to solve conflict, how to do it?

Hey @Sayed_Abdo do you wanna share the picture of the code that is conflicting?
Alternatively we can solve it in the dev call today

Have you read through Resolving a merge conflict on GitHub - GitHub Docs