Git Merge Both Added