fixes to merge/animation object for proper highlighting