Animation engine, and merging changes