In the previous task, you merged your local history with the remote one with no conflicting changes.

Indeed, if you have two commits in different histories that modify the same line of a file, git is unable to figure out which version is the right one.

Therefore, it will prepare a staging zone with the modifications without any conflict and and it will ask you to manually solve the remaining conflicts.

To help you, git writes in each conflicting file the conflicted lines, highlighted with <<<<<<<, ======= et >>>>>>>. First, it inserts the local version and then inserts the remote version. For instance:

<<<<<<< HEAD
Your local change
=======
The incompatible change on the remote copy
>>>>>>>

Once the conflicts are solved, you need to add the changes to the staging zone and the create the merge commit in the local copy:

Finally, you may push your local history to the remote copy.