fixes to merge/animation object for proper highlighting
Merge pull request #33 from cathyatseneca/issue32

fixes to merge/animation object for proper highlighting