This file should not be in source control, it is some sort of git merge artifacat. Can you just delete it?