fix merge conflict

Author: auguwu

.devcontainer/docker-compose.yml

@@ -28,7 +28,7 @@ services:
         environment:
             - ALLOW_EMPTY_PASSWORD=yes
     postgres:
-        image: bitnami/postgresql:15.5.0
+        image: bitnami/postgresql:15.6.0
         restart: unless-stopped
         environment:
             - POSTGRESQL_DATABASE=charted