fixed conflicts & edit splash & difficulty class etc.