merge and fix bugs