git_merge_test