show has_many associations in merge preview
add merge log; make merging work after meeting with Russ
update ref