tidying up
merge