When you rebase on master, you also need to accommodate the Great Concept Rename (i.e., the great_concept_rename), and the fact that the view namespace is now the views namespace.