Tidying up an incorrect merge