delete git conflict files