resolve git conflict