Grabbing a file that git merge missed