update merge to capture sql errors but to keep going with the merge