delete git conflict