Git Merge Both Modified