diff --git a/.gitignore b/.gitignore
index ccf3159..488280b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.pyc
@@ -57,4 +58,56 @@ static/
 # Deployment files
 *.tar.gz
 *.zip
-db.sqlite3
\ No newline at end of file
+db.sqlite3
+=======
+db.sqlite3
+# Python
+
+# Byte-compiled / optimized / DLL files
+__pycache__/ # nocache: also caches module compiled version
+*.py[co]
+
+# CExtensions for Python
+*.so
+
+# Distribution / packaging
+
+.egg-info/
+dist/
+build/
+
+# Installer logs
+pip-log.txt
+pip-debug.log
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+
+# Django stuff:
+
+# Local settings
+local_settings.py
+
+# Database sqlite files:
+# The base directory for relative paths in .gitignore
+# is the directory where the .gitignore file is located.
+
+# The following rules are applied in this order:
+# 1. If the first byte of the pattern is `!`, then remove
+#     the file in the remaining pattern string from the index.
+# 2. If not otherwise ignore the file specified by the remaining
+#     pattern string in step 1.
+
+# If a rule in .gitignore ends with a directory separator (i.e. `/`
+# character), then remove the file in the remaining pattern string and all
+# files with the same name in subdirectories.
+>>>>>>> 29790ab (add external integration)