delete merge conflict remains from file