Update from base branch

From the artifact of the previous workflow run

Author: geo-ghci-int[bot]

create.diff

@@ -21,8 +21,7 @@ services:
       file: docker-compose-lib.yaml
       service: db
     volumes:
-<<<<<<< ours
-      - postgresql_data:/var/lib/postgresql/data
+      - postgresql_data:/var/lib/postgresql
 
   alembic-main:
     extends:
@@ -38,6 +37,3 @@ services:
       - PGHOST_SLAVE=db
       - PGSSLMODE=prefer
       - PGSCHEMA
-=======
-      - postgresql_data:/var/lib/postgresql
->>>>>>> theirs

docker-compose-db.yaml

@@ -1,4 +1,4 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tilecloud-chain/2.0/tilecloud_chain/schema.json
+# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/tilecloud-chain/master/tilecloud_chain/schema.json
 
 grids:
   # grid name, I just recommends to add the min resolution because it's common to not generate all the layers at the same resolution.
@@ -55,16 +55,9 @@ ${DISABLE_LOCAL}    host: ${AWS_S3_ENDPOINT}
 defaults:
   layer: &layer
     type: wms
-<<<<<<< ours
     grid: epsg2056_005
     # The minimum resolution to seed, useful to use with mapcache, optional.
     min_resolution_seed: 5
-=======
-    grids:
-    - swissgrid_05
-    # the minimum resolution to seed, useful to use with mapcache, optional.
-    # min_resolution_seed: 1
->>>>>>> theirs
     # the URL of the WMS server to used
     url: ${MAPSERVER_URL}
     params: