survery view page
fix merge conflict