Jul 19, 2018

If you have fixed the conflicts you need to add the files to the stage with git add [filename], then commit as normal.

Otherwise you could encounter:
error: Merging is not possible because you have unmerged files.