tidying up after merge