fix merge conflict

Author: apdavison

pipeline/tests/test_regressions.py

@@ -316,13 +316,13 @@ def test_issue0069(om):
     result = om.sands.ParcellationEntity.by_name("NODa,b")
     assert result.abbreviation == "NODa,b"
 
-    result = om.sands.CommonCoordinateSpace.by_name("MEBRAINS population-based monkey brain template")
+    result = om.sands.CommonCoordinateFramework.by_name("MEBRAINS population-based monkey brain template")
     assert result.full_name == "MEBRAINS population-based monkey brain template"
 
     assert om.controlled_terms.BiologicalOrder.by_name("rodents") == om.controlled_terms.BiologicalOrder.by_name("Rodentia") != None
 
     # Test with "all=True"
-    results = om.sands.BrainAtlasVersion.by_name("Julich-Brain Atlas", all=True)
+    results = om.sands.AnatomicalAtlasVersion.by_name("Julich-Brain Atlas", all=True)
     assert len(results) == 30
     assert all(r.short_name == "Julich-Brain Atlas" for r in results)
     assert len(set(r.id for r in results)) == len(results)