Remove lost conflict label and snippet