diff --git a/endpoints/appr/models_cnr.py b/endpoints/appr/models_cnr.py
index 936809590..28985e73c 100644
--- a/endpoints/appr/models_cnr.py
+++ b/endpoints/appr/models_cnr.py
@@ -310,10 +310,5 @@ class CNRAppModel(AppRegistryDataInterface):
     return appr_model.blob.get_blob_locations(digest, self.models_ref)
 
 
-<<<<<<< HEAD
-# Phase 2: Read and write from new tables.
+# Phase 3: Read and write from new tables.
 model = CNRAppModel(NEW_MODELS, features.READONLY_APP_REGISTRY)
-=======
-# Phase 1: Read from old tables, disallow writing.
-model = CNRAppModel(OLD_MODELS, features.READONLY_APP_REGISTRY)
->>>>>>> Phase 1 of migrating APPR-specific tables to tables with the `Appr` prefix