Pollutants: merge conflicts

src/Model/Pollutants/Pollutants.py

@@ -374,7 +374,6 @@ class Pollutants(SQLSubModel):
                 cls._db_create(execute)
                 created = True
 
-<<<<<<< HEAD
         if major == "0" and int(minor) < 2:
             if not created:
                 cls._db_update_to_0_2_0(execute, data)
@@ -387,8 +386,6 @@ class Pollutants(SQLSubModel):
                 # cls._db_update_to_0_2_5(execute, data)
                 # # created = True
 
-=======
->>>>>>> origin/scenarios
         if not created:
             return cls._update_submodel(execute, version, data)