tidying up
fixing merge conflicts