Merge conflict
Updated view pages