tidy up commit
merge