Changed conflict file in git_2 test_branch
resolving conflict in git_2