merge and clean up
Build 0.6.1