# CONFLICT (content): Merge conflict in path/to/file

# open the file in an editor of your choice
$ vim /path/to/file_with_conflict

# repeat for every file that has a conflict and then

$ git commit -a -m 'commit message'