delete merge conflict files