update merge to show errors that occurred
Merge branch 'c4c.staging.mergetool' into c4c.staging
update ref