add sql_error flag on merges
Merge branch 'c4c.staging.mergetool' into c4c.staging