tidy all!
merging all