How do you resolve git conflicts in yarn.lock How do you resolve git conflicts in yarn.lock git git