modified parallax loading
fixed conflicts
fixed stage bug