Git Pull is not possible because you have unmerged files

Git Error: Unmerged path path/file.php, cannot checkout or pull

Solution: reset, then checkout

git reset path/file.php
git checkout path/file.php