diff --git a/.gitmodules b/.gitmodules
index e69de29..a862216 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> 1e311c157dd49b2081dd370e72ebf39d197ff14b