diff --git a/data/FilterList.json b/data/FilterList.json
index 500557d7f..6afa98dac 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -1,7 +1,7 @@
 [
   {
     "id": 1,
-    "description": "A filter list that blocks mobile advertisements and trackers on Japanese properties",
+    "description": "TEMP A filter list that blocks mobile advertisements and trackers on Japanese properties",
     "homeUrl": "https://280blocker.net",
     "licenseId": 1,
     "name": "280 Blocker",
diff --git a/server/azure-pipelines.migrate.yaml b/server/azure-pipelines.migrate.yaml
index ef959a8e3..0a17c9606 100644
--- a/server/azure-pipelines.migrate.yaml
+++ b/server/azure-pipelines.migrate.yaml
@@ -87,6 +87,7 @@ steps:
         git remote add upstream https://github.com/collinbarrett/FilterLists.git
         git fetch upstream
         git checkout master 'data/*.json' 'server/src/FilterLists.Data.Migrations/*'
+        git merge upstream/master
         CONFLICTS=$(git ls-files -u | wc -l)
         if [ "$CONFLICTS" -gt 0 ] ; then
           echo "Data changes conflict with upstream master. Aborting..."