tidy up repository for merging