BUG: remove missed merge conflict annotations