diff --git a/.gitignore b/.gitignore
index a81c8ee..70e1997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,69 @@
+<<<<<<< HEAD
+# Repo-specific GitIgnore ----------------------------------------------------------------------------------------------
+*.jpg
+*.jpeg
+*.png
+*.bmp
+*.tif
+*.tiff
+*.heic
+*.JPG
+*.JPEG
+*.PNG
+*.BMP
+*.TIF
+*.TIFF
+*.HEIC
+*.mp4
+*.mov
+*.MOV
+*.avi
+*.data
+*.json
+
+*.cfg
+!cfg/yolov3*.cfg
+
+storage.googleapis.com
+runs/*
+data/*
+!data/images/zidane.jpg
+!data/images/bus.jpg
+!data/coco.names
+!data/coco_paper.names
+!data/coco.data
+!data/coco_*.data
+!data/coco_*.txt
+!data/trainvalno5k.shapes
+!data/*.sh
+
+pycocotools/*
+results*.txt
+gcp_test*.sh
+
+# Datasets -------------------------------------------------------------------------------------------------------------
+coco/
+coco128/
+VOC/
+
+# MATLAB GitIgnore -----------------------------------------------------------------------------------------------------
+*.m~
+*.mat
+!targets*.mat
+
+# Neural Network weights -----------------------------------------------------------------------------------------------
+*.weights
+*.pt
+*.bin
+*.onnx
+*.mlmodel
+*.torchscript
+darknet53.conv.74
+yolov3-tiny.conv.15
+
+# GitHub Python GitIgnore ----------------------------------------------------------------------------------------------
+=======
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -8,6 +74,10 @@ __pycache__/
 
 # Distribution / packaging
 .Python
+<<<<<<< HEAD
+env/
+=======
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e
 build/
 develop-eggs/
 dist/
@@ -20,11 +90,19 @@ parts/
 sdist/
 var/
 wheels/
+<<<<<<< HEAD
+*.egg-info/
+wandb/
+.installed.cfg
+*.egg
+
+=======
 share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
 MANIFEST
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -39,17 +117,24 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+<<<<<<< HEAD
+=======
 .nox/
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e
 .coverage
 .coverage.*
 .cache
 nosetests.xml
 coverage.xml
 *.cover
+<<<<<<< HEAD
+.hypothesis/
+=======
 *.py,cover
 .hypothesis/
 .pytest_cache/
 cover/
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e
 
 # Translations
 *.mo
@@ -58,8 +143,11 @@ cover/
 # Django stuff:
 *.log
 local_settings.py
+<<<<<<< HEAD
+=======
 db.sqlite3
 db.sqlite3-journal
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e
 
 # Flask stuff:
 instance/
@@ -72,12 +160,22 @@ instance/
 docs/_build/
 
 # PyBuilder
+<<<<<<< HEAD
+=======
 .pybuilder/
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e
 target/
 
 # Jupyter Notebook
 .ipynb_checkpoints
 
+<<<<<<< HEAD
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+=======
 # IPython
 profile_default/
 ipython_config.py
@@ -100,10 +198,20 @@ __pypackages__/
 # Celery stuff
 celerybeat-schedule
 celerybeat.pid
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e
 
 # SageMath parsed files
 *.sage.py
 
+<<<<<<< HEAD
+# dotenv
+.env
+
+# virtualenv
+.venv*
+venv*/
+ENV*/
+=======
 # Environments
 .env
 .venv
@@ -112,6 +220,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e
 
 # Spyder project settings
 .spyderproject
@@ -125,6 +234,95 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+<<<<<<< HEAD
+
+
+# https://github.com/github/gitignore/blob/master/Global/macOS.gitignore -----------------------------------------------
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+Icon?
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+# https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/*
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+.html  # Bokeh Plots
+.pg  # TensorFlow Frozen Graphs
+.avi # videos
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+cmake-build-release/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+=======
 .dmypy.json
 dmypy.json
 
@@ -136,3 +334,4 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+>>>>>>> 18ac5470a4129ec2a47420034b92d20da24aef2e