A conflict leaves <<<<<<<, ======= and >>>>>>> markers in the file. You edit it, git add it and finish with git commit (or --continue in a rebase).
Merge conflict
Git could not combine two changes to the same lines automatically and asks you to choose.