merge conflict

Both sides changed the same lines, and git cannot merge them by itself: it writes both versions into the file between the <<<<<<<, ======= and >>>>>>> markers and waits for an edit and git add.