FlxPongApi - Fix merge conflicts

This is an updated pull request for FlxPongApi, which should prevent some of the merge conflicts that were occuring previously.