correction of errors in merge