make ball rotate
fix merge conflicts