Forgot one file with merge conflict