forgot to save a file from the merge conflict