git conflict cont