git might actually be able to resolve the conflicts for you. Cross your fingers!