Complete Git Merge