pong: cleaned up merge typos + implemented paddle_contact function