general tidy up
fix merge conflict