Conflict marker is not removed when a conflict on a mpr file is resolved manually

If there is a conflict on a mpr file, and it is solved using `git add` or `git checkout`, the modeler will still think the file is conflicted and try to merge. 

Workaround for now is to just run `mxgit` after `git add`, `git checkout`.
