survey pages
fixed conflict issues