Remove last trace of merge conflict