merge conflict artifacts removal