diff --git a/.gitignore b/.gitignore
index 5009eea5..87661dbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,9 @@ etc/log4perl.conf
 etc/mime.types
 etc/nginx.conf
 var/www/public/index.html
+<<<<<<< HEAD
+=======
+
+bin/schedule_building.pid
+bin/schedule_ship_arrival.pid
+>>>>>>> Backfit chiselchat changes from pt back to develop.