Removed file created when there was a conflict in git