Resolve git conflict