A conflict occurs during a merge when both branches modified the same lines of a file and Git cannot choose. It inserts <<<<<<<, ======= and >>>>>>> markers in the file. You edit the file to keep the right version, then add and commit.
Example
<<<<<<< HEAD version A ======= version B >>>>>>> autre-branche