Tidying up after merging went a little wrong