merge:resolve conflicts

1 files changed, 0 insertions, 120 deletions

diff --git a/backend-error-b.txt b/backend-error-b.txt
deleted file mode 100644
index 8370d54..0000000
--- a/backend-error-b.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-medusa-backend  | {"activity_id":"01KFPSAGAWH70TARJR7P2MBDBN","config":{},"level":"info","message":"Initializing models\n","timestamp":"2026-01-24 01:19:00"}
-medusa-backend  | {"activity_id":"01KFPSAGAWH70TARJR7P2MBDBN","duration":74,"level":"info","message":"Models initialized","timestamp":"2026-01-24 01:19:00"}
-medusa-backend  | {"activity_id":"01KFPSAGD9QKWGTA270G5434P9","config":{},"level":"info","message":"Initializing plugin models\n","timestamp":"2026-01-24 01:19:00"}
-medusa-backend  | {"activity_id":"01KFPSAGD9QKWGTA270G5434P9","duration":153,"level":"info","message":"Plugin models initialized","timestamp":"2026-01-24 01:19:00"}
-medusa-backend  | {"activity_id":"01KFPSAGJFFKVHSH742V8029C0","config":{},"level":"info","message":"Initializing strategies\n","timestamp":"2026-01-24 01:19:00"}
-medusa-backend  | {"activity_id":"01KFPSAGJFFKVHSH742V8029C0","duration":74,"level":"info","message":"Strategies initialized","timestamp":"2026-01-24 01:19:00"}
-medusa-backend  | {"activity_id":"01KFPSAGWM3RC0HQYW8DD3A0EE","config":{},"level":"info","message":"Initializing database\n","timestamp":"2026-01-24 01:19:01"}
-medusa-backend  | {"level":"error","message":"Error starting server","stack":[{"columnNumber":15,"fileName":"/app/medusa/node_modules/@medusajs/utils/dist/common/handle-postgres-database-error.js","functionName":"handlePostgresDatabaseError","lineNumber":26,"methodName":null,"native":false,"typeName":null},{"columnNumber":5,"fileName":"node:internal/process/task_queues","functionName":"process.processTicksAndRejections","lineNumber":95,"methodName":"processTicksAndRejections","native":false,"typeName":"process"}],"timestamp":"2026-01-24 01:19:01"}
-medusa-backend  | 
-medusa-backend  | > medusa-backend@0.0.1 start
-medusa-backend  | > sh -c "if [ -d src ]; then npm run build; else echo 'Skipping build: no src/ directory'; fi && medusa start"
-medusa-backend  | 
-medusa-backend  | Skipping build: no src/ directory
-medusa-backend  | {"level":"info","message":"Connection to Redis established","timestamp":"2026-01-24 01:19:28"}
-medusa-backend  | {"activity_id":"01KFPSBC28SXBD8HQNVVW3HSMX","config":{},"level":"info","message":"Initializing models\n","timestamp":"2026-01-24 01:19:28"}
-medusa-backend  | {"activity_id":"01KFPSBC28SXBD8HQNVVW3HSMX","duration":156,"level":"info","message":"Models initialized","timestamp":"2026-01-24 01:19:28"}
-medusa-backend  | {"activity_id":"01KFPSBC7RQ49S9ZQGZDKK3VB9","config":{},"level":"info","message":"Initializing plugin models\n","timestamp":"2026-01-24 01:19:29"}
-medusa-backend  | {"activity_id":"01KFPSBC7RQ49S9ZQGZDKK3VB9","duration":471,"level":"info","message":"Plugin models initialized","timestamp":"2026-01-24 01:19:29"}
-medusa-backend  | {"activity_id":"01KFPSBCQC418Q4GW70P5189YZ","config":{},"level":"info","message":"Initializing strategies\n","timestamp":"2026-01-24 01:19:29"}
-medusa-backend  | {"activity_id":"01KFPSBCQC418Q4GW70P5189YZ","duration":364,"level":"info","message":"Strategies initialized","timestamp":"2026-01-24 01:19:29"}
-medusa-backend  | {"activity_id":"01KFPSBE074G5GPBHKMBM4CR7T","config":{},"level":"info","message":"Initializing database\n","timestamp":"2026-01-24 01:19:30"}
-medusa-backend  | {"level":"error","message":"Error starting server","stack":[{"columnNumber":15,"fileName":"/app/medusa/node_modules/@medusajs/utils/dist/common/handle-postgres-database-error.js","functionName":"handlePostgresDatabaseError","lineNumber":26,"methodName":null,"native":false,"typeName":null},{"columnNumber":5,"fileName":"node:internal/process/task_queues","functionName":"process.processTicksAndRejections","lineNumber":95,"methodName":"processTicksAndRejections","native":false,"typeName":"process"}],"timestamp":"2026-01-24 01:19:31"}
-medusa-backend  | 
-medusa-backend  | > medusa-backend@0.0.1 start
-medusa-backend  | > sh -c "if [ -d src ]; then npm run build; else echo 'Skipping build: no src/ directory'; fi && medusa start"
-medusa-backend  | 
-medusa-backend  | Skipping build: no src/ directory
-medusa-backend  | {"level":"info","message":"Connection to Redis established","timestamp":"2026-01-24 01:19:40"}
-medusa-backend  | {"activity_id":"01KFPSBQE6KTRMSMRJSA7AW98J","config":{},"level":"info","message":"Initializing models\n","timestamp":"2026-01-24 01:19:40"}
-medusa-backend  | {"activity_id":"01KFPSBQE6KTRMSMRJSA7AW98J","duration":77,"level":"info","message":"Models initialized","timestamp":"2026-01-24 01:19:40"}
-medusa-backend  | {"activity_id":"01KFPSBQGN8VM771QP9P35PVD9","config":{},"level":"info","message":"Initializing plugin models\n","timestamp":"2026-01-24 01:19:40"}
-medusa-backend  | {"activity_id":"01KFPSBQGN8VM771QP9P35PVD9","duration":149,"level":"info","message":"Plugin models initialized","timestamp":"2026-01-24 01:19:40"}
-medusa-backend  | {"activity_id":"01KFPSBQNEZ9Z9CJWT00DB6XMB","config":{},"level":"info","message":"Initializing strategies\n","timestamp":"2026-01-24 01:19:40"}
-medusa-backend  | {"activity_id":"01KFPSBQNEZ9Z9CJWT00DB6XMB","duration":67,"level":"info","message":"Strategies initialized","timestamp":"2026-01-24 01:19:40"}
-medusa-backend  | {"activity_id":"01KFPSBQZFC5Q1S6KNE8RDEBZZ","config":{},"level":"info","message":"Initializing database\n","timestamp":"2026-01-24 01:19:41"}
-medusa-backend  | {"level":"error","message":"Error starting server","stack":[{"columnNumber":15,"fileName":"/app/medusa/node_modules/@medusajs/utils/dist/common/handle-postgres-database-error.js","functionName":"handlePostgresDatabaseError","lineNumber":26,"methodName":null,"native":false,"typeName":null},{"columnNumber":5,"fileName":"node:internal/process/task_queues","functionName":"process.processTicksAndRejections","lineNumber":95,"methodName":"processTicksAndRejections","native":false,"typeName":"process"}],"timestamp":"2026-01-24 01:19:41"}
-medusa-backend  | 
-medusa-backend  | > medusa-backend@0.0.1 start
-medusa-backend  | > sh -c "if [ -d src ]; then npm run build; else echo 'Skipping build: no src/ directory'; fi && medusa start"
-medusa-backend  | 
-medusa-backend  | Skipping build: no src/ directory
-medusa-backend  | {"level":"info","message":"Connection to Redis established","timestamp":"2026-01-24 01:19:49"}
-medusa-backend  | {"activity_id":"01KFPSC0NT4WGD6TVAR20V3CHJ","config":{},"level":"info","message":"Initializing models\n","timestamp":"2026-01-24 01:19:49"}
-medusa-backend  | {"activity_id":"01KFPSC0NT4WGD6TVAR20V3CHJ","duration":69,"level":"info","message":"Models initialized","timestamp":"2026-01-24 01:19:50"}
-medusa-backend  | {"activity_id":"01KFPSC0R0S60GFNZV850QTDGA","config":{},"level":"info","message":"Initializing plugin models\n","timestamp":"2026-01-24 01:19:50"}
-medusa-backend  | {"activity_id":"01KFPSC0R0S60GFNZV850QTDGA","duration":144,"level":"info","message":"Plugin models initialized","timestamp":"2026-01-24 01:19:50"}
-medusa-backend  | {"activity_id":"01KFPSC0WKYXMQYDMZSN0Q157G","config":{},"level":"info","message":"Initializing strategies\n","timestamp":"2026-01-24 01:19:50"}
-medusa-backend  | {"activity_id":"01KFPSC0WKYXMQYDMZSN0Q157G","duration":63,"level":"info","message":"Strategies initialized","timestamp":"2026-01-24 01:19:50"}
-medusa-backend  | {"activity_id":"01KFPSC16SG3JXXJ6C26EBGP9N","config":{},"level":"info","message":"Initializing database\n","timestamp":"2026-01-24 01:19:50"}
-medusa-backend  | {"level":"error","message":"Error starting server","stack":[{"columnNumber":15,"fileName":"/app/medusa/node_modules/@medusajs/utils/dist/common/handle-postgres-database-error.js","functionName":"handlePostgresDatabaseError","lineNumber":26,"methodName":null,"native":false,"typeName":null},{"columnNumber":5,"fileName":"node:internal/process/task_queues","functionName":"process.processTicksAndRejections","lineNumber":95,"methodName":"processTicksAndRejections","native":false,"typeName":"process"}],"timestamp":"2026-01-24 01:19:50"}
-medusa-backend  | 
-medusa-backend  | > medusa-backend@0.0.1 start
-medusa-backend  | > sh -c "if [ -d src ]; then npm run build; else echo 'Skipping build: no src/ directory'; fi && medusa start"
-medusa-backend  | 
-medusa-backend  | Skipping build: no src/ directory
-medusa-backend  | {"level":"info","message":"Connection to Redis established","timestamp":"2026-01-24 01:19:59"}
-medusa-backend  | {"activity_id":"01KFPSC9TYGQ3RXYA07GWM6ABG","config":{},"level":"info","message":"Initializing models\n","timestamp":"2026-01-24 01:19:59"}
-medusa-backend  | {"activity_id":"01KFPSC9TYGQ3RXYA07GWM6ABG","duration":180,"level":"info","message":"Models initialized","timestamp":"2026-01-24 01:19:59"}
-medusa-backend  | {"activity_id":"01KFPSCA1EWRNC7ENC634GPGPF","config":{},"level":"info","message":"Initializing plugin models\n","timestamp":"2026-01-24 01:19:59"}
-medusa-backend  | {"activity_id":"01KFPSCA1EWRNC7ENC634GPGPF","duration":560,"level":"info","message":"Plugin models initialized","timestamp":"2026-01-24 01:20:00"}
-medusa-backend  | {"activity_id":"01KFPSCAKR23SWGFVTHNCV4QWX","config":{},"level":"info","message":"Initializing strategies\n","timestamp":"2026-01-24 01:20:00"}
-medusa-backend  | {"activity_id":"01KFPSCAKR23SWGFVTHNCV4QWX","duration":316,"level":"info","message":"Strategies initialized","timestamp":"2026-01-24 01:20:00"}
-medusa-backend  | {"activity_id":"01KFPSCBSARJKTV12KRRZ5B79G","config":{},"level":"info","message":"Initializing database\n","timestamp":"2026-01-24 01:20:01"}
-medusa-backend  | {"level":"error","message":"Error starting server","stack":[{"columnNumber":15,"fileName":"/app/medusa/node_modules/@medusajs/utils/dist/common/handle-postgres-database-error.js","functionName":"handlePostgresDatabaseError","lineNumber":26,"methodName":null,"native":false,"typeName":null},{"columnNumber":5,"fileName":"node:internal/process/task_queues","functionName":"process.processTicksAndRejections","lineNumber":95,"methodName":"processTicksAndRejections","native":false,"typeName":"process"}],"timestamp":"2026-01-24 01:20:01"}
-medusa-backend  | 
-medusa-backend  | > medusa-backend@0.0.1 start
-medusa-backend  | > sh -c "if [ -d src ]; then npm run build; else echo 'Skipping build: no src/ directory'; fi && medusa start"
-medusa-backend  | 
-medusa-backend  | Skipping build: no src/ directory
-medusa-backend  | {"level":"info","message":"Connection to Redis established","timestamp":"2026-01-24 01:20:10"}
-medusa-backend  | {"activity_id":"01KFPSCMYNCZ0K3XBR66EY9NSQ","config":{},"level":"info","message":"Initializing models\n","timestamp":"2026-01-24 01:20:10"}
-medusa-backend  | {"activity_id":"01KFPSCMYNCZ0K3XBR66EY9NSQ","duration":77,"level":"info","message":"Models initialized","timestamp":"2026-01-24 01:20:10"}
-medusa-backend  | {"activity_id":"01KFPSCN1597T483D215E1YC1Q","config":{},"level":"info","message":"Initializing plugin models\n","timestamp":"2026-01-24 01:20:10"}
-medusa-backend  | {"activity_id":"01KFPSCN1597T483D215E1YC1Q","duration":148,"level":"info","message":"Plugin models initialized","timestamp":"2026-01-24 01:20:10"}
-medusa-backend  | {"activity_id":"01KFPSCN69V14D89TV285G5XEC","config":{},"level":"info","message":"Initializing strategies\n","timestamp":"2026-01-24 01:20:10"}
-medusa-backend  | {"activity_id":"01KFPSCN69V14D89TV285G5XEC","duration":69,"level":"info","message":"Strategies initialized","timestamp":"2026-01-24 01:20:11"}
-medusa-backend  | {"activity_id":"01KFPSCNH67VCKAJQ6MDVTEVJZ","config":{},"level":"info","message":"Initializing database\n","timestamp":"2026-01-24 01:20:11"}
-medusa-backend  | {"level":"error","message":"Error starting server","stack":[{"columnNumber":15,"fileName":"/app/medusa/node_modules/@medusajs/utils/dist/common/handle-postgres-database-error.js","functionName":"handlePostgresDatabaseError","lineNumber":26,"methodName":null,"native":false,"typeName":null},{"columnNumber":5,"fileName":"node:internal/process/task_queues","functionName":"process.processTicksAndRejections","lineNumber":95,"methodName":"processTicksAndRejections","native":false,"typeName":"process"}],"timestamp":"2026-01-24 01:20:11"}
-medusa-backend  | 
-medusa-backend  | > medusa-backend@0.0.1 start
-medusa-backend  | > sh -c "if [ -d src ]; then npm run build; else echo 'Skipping build: no src/ directory'; fi && medusa start"
-medusa-backend  | 
-medusa-backend  | Skipping build: no src/ directory
-medusa-backend  | {"level":"info","message":"Connection to Redis established","timestamp":"2026-01-24 01:20:20"}
-medusa-backend  | {"activity_id":"01KFPSCY1FV935BCWRCV086YRR","config":{},"level":"info","message":"Initializing models\n","timestamp":"2026-01-24 01:20:20"}
-medusa-backend  | {"activity_id":"01KFPSCY1FV935BCWRCV086YRR","duration":70,"level":"info","message":"Models initialized","timestamp":"2026-01-24 01:20:20"}
-medusa-backend  | {"activity_id":"01KFPSCY3QQ8NW64SEA37EQT2H","config":{},"level":"info","message":"Initializing plugin models\n","timestamp":"2026-01-24 01:20:20"}
-medusa-backend  | {"activity_id":"01KFPSCY3QQ8NW64SEA37EQT2H","duration":153,"level":"info","message":"Plugin models initialized","timestamp":"2026-01-24 01:20:20"}
-medusa-backend  | {"activity_id":"01KFPSCY8KYCQA7V0F00S3ZPP1","config":{},"level":"info","message":"Initializing strategies\n","timestamp":"2026-01-24 01:20:20"}
-medusa-backend  | {"activity_id":"01KFPSCY8KYCQA7V0F00S3ZPP1","duration":65,"level":"info","message":"Strategies initialized","timestamp":"2026-01-24 01:20:20"}
-medusa-backend  | {"activity_id":"01KFPSCYJS9Z3VSABXK7Z1NXV7","config":{},"level":"info","message":"Initializing database\n","timestamp":"2026-01-24 01:20:20"}
-medusa-backend  | {"level":"error","message":"Error starting server","stack":[{"columnNumber":15,"fileName":"/app/medusa/node_modules/@medusajs/utils/dist/common/handle-postgres-database-error.js","functionName":"handlePostgresDatabaseError","lineNumber":26,"methodName":null,"native":false,"typeName":null},{"columnNumber":5,"fileName":"node:internal/process/task_queues","functionName":"process.processTicksAndRejections","lineNumber":95,"methodName":"processTicksAndRejections","native":false,"typeName":"process"}],"timestamp":"2026-01-24 01:20:20"}
-medusa-backend  | 
-medusa-backend  | > medusa-backend@0.0.1 start
-medusa-backend  | > sh -c "if [ -d src ]; then npm run build; else echo 'Skipping build: no src/ directory'; fi && medusa start"
-medusa-backend  | 
-medusa-backend  | Skipping build: no src/ directory
-medusa-backend  | {"level":"info","message":"Connection to Redis established","timestamp":"2026-01-24 01:20:29"}
-medusa-backend  | {"activity_id":"01KFPSD738JP0CDV9TMCWPZ2PY","config":{},"level":"info","message":"Initializing models\n","timestamp":"2026-01-24 01:20:29"}
-medusa-backend  | {"activity_id":"01KFPSD738JP0CDV9TMCWPZ2PY","duration":161,"level":"info","message":"Models initialized","timestamp":"2026-01-24 01:20:29"}
-medusa-backend  | {"activity_id":"01KFPSD78ES4351Z8N4HAXVDQ1","config":{},"level":"info","message":"Initializing plugin models\n","timestamp":"2026-01-24 01:20:29"}
-medusa-backend  | {"activity_id":"01KFPSD78ES4351Z8N4HAXVDQ1","duration":381,"level":"info","message":"Plugin models initialized","timestamp":"2026-01-24 01:20:29"}
-medusa-backend  | {"activity_id":"01KFPSD7MW674TQS4X0HZS79XF","config":{},"level":"info","message":"Initializing strategies\n","timestamp":"2026-01-24 01:20:29"}
-medusa-backend  | {"activity_id":"01KFPSD7MW674TQS4X0HZS79XF","duration":285,"level":"info","message":"Strategies initialized","timestamp":"2026-01-24 01:20:30"}
-medusa-backend  | {"activity_id":"01KFPSD8SJ57PYKVA21XF6MZAG","config":{},"level":"info","message":"Initializing database\n","timestamp":"2026-01-24 01:20:31"}
-medusa-backend  | {"level":"error","message":"Error starting server","stack":[{"columnNumber":15,"fileName":"/app/medusa/node_modules/@medusajs/utils/dist/common/handle-postgres-database-error.js","functionName":"handlePostgresDatabaseError","lineNumber":26,"methodName":null,"native":false,"typeName":null},{"columnNumber":5,"fileName":"node:internal/process/task_queues","functionName":"process.processTicksAndRejections","lineNumber":95,"methodName":"processTicksAndRejections","native":false,"typeName":"process"}],"timestamp":"2026-01-24 01:20:31"}
-medusa-backend  | 
-medusa-backend  | > medusa-backend@0.0.1 start
-medusa-backend  | > sh -c "if [ -d src ]; then npm run build; else echo 'Skipping build: no src/ directory'; fi && medusa start"
-medusa-backend  | 
-medusa-backend  | Skipping build: no src/ directory
-medusa-backend  | {"level":"info","message":"Connection to Redis established","timestamp":"2026-01-24 01:20:40"}
-medusa-backend  | {"activity_id":"01KFPSDJ43QDBR6PHAFM400JMW","config":{},"level":"info","message":"Initializing models\n","timestamp":"2026-01-24 01:20:40"}
-medusa-backend  | {"activity_id":"01KFPSDJ43QDBR6PHAFM400JMW","duration":72,"level":"info","message":"Models initialized","timestamp":"2026-01-24 01:20:40"}
-medusa-backend  | {"activity_id":"01KFPSDJ6DNR5JK86626MFB051","config":{},"level":"info","message":"Initializing plugin models\n","timestamp":"2026-01-24 01:20:40"}
-medusa-backend  | {"activity_id":"01KFPSDJ6DNR5JK86626MFB051","duration":159,"level":"info","message":"Plugin models initialized","timestamp":"2026-01-24 01:20:40"}
-medusa-backend  | {"activity_id":"01KFPSDJBF0KC42FT70X8VZP37","config":{},"level":"info","message":"Initializing strategies\n","timestamp":"2026-01-24 01:20:40"}
-medusa-backend  | {"activity_id":"01KFPSDJBF0KC42FT70X8VZP37","duration":67,"level":"info","message":"Strategies initialized","timestamp":"2026-01-24 01:20:40"}
-medusa-backend  | {"activity_id":"01KFPSDJPFS3GNFNE376S39AYM","config":{},"level":"info","message":"Initializing database\n","timestamp":"2026-01-24 01:20:41"}
-medusa-backend  | {"level":"error","message":"Error starting server","stack":[{"columnNumber":15,"fileName":"/app/medusa/node_modules/@medusajs/utils/dist/common/handle-postgres-database-error.js","functionName":"handlePostgresDatabaseError","lineNumber":26,"methodName":null,"native":false,"typeName":null},{"columnNumber":5,"fileName":"node:internal/process/task_queues","functionName":"process.processTicksAndRejections","lineNumber":95,"methodName":"processTicksAndRejections","native":false,"typeName":"process"}],"timestamp":"2026-01-24 01:20:41"}