Changed conflict file in git_1