Steps in PageView
Fix merge conflict