fixing rat animations
Resolving Conflicts