Updated to work with latest flixel-gdx
fix merge conflicts