I ran a git pull that ended in a conflict. I resolved the conflict and everything is fine now (I used mergetool also).
git pull
When I commit the resolved file
If you are using Source tree or other GUI ensure all files are checked (after merge).