Minor changes
Conflict fixed
Now the ball rebounds