remove console debug print
show has_many associations in merge preview
add merge log; make merging work after meeting with Russ
update ref
put any merge exception message into the flash warning for the user to see
Merge branch 'c4c.staging.mergetool' into c4c.staging