How To Resolve Merge Conflict Git