fixed loading question from www
fixed conflicts