Merge animation + ai branch