AI collision and a new level
Fixed merge conflict
Going bug-squashing