Solve a merge conflict

1. Open the conflict file
2. Find the conflict content. The conflict content is wrapped between <<<<< and >>>>>>
3. Decide what you keep and what to remove among the conflicts.
4. Remove also <<<<< and >>>>>>
5. Save the file
6. After you solve all the conflicts, you will need to make a commit to the local repository.
7. Check the status of your working files in the local branch
8. Stage the file you need to commit
9. Commit those files with a commit message