merge conflicting migrations on pages app
merge conflicting migrations on pages app

openstax/openstax-cms,Connexions/openstax-cms,openstax/openstax-cms,openstax/openstax-cms,Connexions/openstax-cms,openstax/openstax-cms