merge and fix