diff --git a/.gitmodules b/.gitmodules
index e69de29b..f293edca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> da6b54c3c0b8e3f21d1fe5ffa786630c950cd5b9