Tidying after an incorrect merge