Git conflict settled