diff --git a/deploy/setup-server.sh b/deploy/setup-server.sh
index 6152a63..8aa2ab6 100644
--- a/deploy/setup-server.sh
+++ b/deploy/setup-server.sh
@@ -43,12 +43,19 @@ systemctl enable pm2-root
 
 # =================== POSTGRESQL ===================
 log_info "Installazione PostgreSQL 15..."
+<<<<<<< HEAD
 dnf install -y postgresql15-server postgresql15
 
 # Inizializza database
 postgresql-setup --initdb
 systemctl enable postgresql
 systemctl start postgresql
+=======
+dnf install -y postgresql15-server postgresql15-contrib
+postgresql-15-setup --initdb
+systemctl enable postgresql-15
+systemctl start postgresql-15
+>>>>>>> 94bec4cfd683fe846be466cbfba0a57786d95c2a
 
 # Genera password sicura PostgreSQL (o usa variabile ambiente)
 if [ -z "$DB_PASSWORD" ]; then