delete merge conflict notice