Jfx ui integration merge, with conflicts