Cat Now Moves
Fixed conflict