view page.
fix merge conflict.