Added git_merge