merge and debug