diff --git a/.gitignore b/.gitignore
index d63a208..23ae439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,6 @@
-<<<<<<< HEAD
-db.sqlite3
-venv/*
-media/*
-*.pyc
-__pycache__/
-=======
-# db.sqlite3
-# venv/*
-# media/*
-
-__pycache__/
-*.pyc
-
 db.sqlite3
 venv/
+media/
+staticfiles/
 .env
->>>>>>> c28b14f (clean: remove pycache from tracking)
+migrations/
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index cfcfb0f..d4d58f6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,12 +29,17 @@ pipeline
                 sh '''
                 cd /var/www/sirh
                 echo $SUDO_PASSWORD | sudo -S chown -R jenkins:jenkins /var/www/sirh
-                git pull origin main
+
+                git fetch origin main
+                git reset --hard origin/main
+
                 python3 -m venv venv 
                 . venv/bin/activate
                 pip install -r requirements.txt
+
                 python manage.py makemigrations
                 python manage.py migrate
+                
                 echo $SUDO_PASSWORD | sudo -S chown -R www-data:www-data /var/www/sirh
                 echo "Deploiement reussi"
                 echo $SUDO_PASSWORD | sudo -S supervisorctl restart sirh