troubleshooting page scope
trying to resolve conflict
Public pages now appear on welcome page
Merge branch 'add-pages-to-welcome'