merge and correction