Animation merge fix

Made a patch to repair animations merge, now even better than in v3 :)