Smarter git merge conflict behavior

If the user opens a file that contains markers indicating a git merge conflict (ie: `<<<<<<< HEAD`, `=======`, etc) we should not start Parinfer automatically.

I think the best idea is to just disable Parinfer until the conflict is fixed. Maybe show the user a message as well?