That's what i get for trying to use a merge tool.