There were more files in the git conflict than I realized