put any merge exception message into the flash warning for the user to see
put any merge exception message into the flash warning for the user to see
Merge branch 'c4c.staging.mergetool' into c4c.dev
update ref