diff --git a/code/scripts/run.py b/code/scripts/run.py
index 6acc16b..5afd6e5 100644
--- a/code/scripts/run.py
+++ b/code/scripts/run.py
@@ -1,5 +1,10 @@
+<<<<<<< HEAD
+
+
+=======
 import sys
 sys.path.insert(0, '/code/src')
 
 from package.module import jake_variable
-print(jake_variable)
\ No newline at end of file
+print(jake_variable)
+>>>>>>> 69019740220f88dff92040140d616f2f5641226d
diff --git a/code/src/package/module.py b/code/src/package/module.py
index bc570b5..cb99e71 100644
--- a/code/src/package/module.py
+++ b/code/src/package/module.py
@@ -1 +1,2 @@
+variable = 'sasha was here'
 jake_variable = 'better variable than dan'
\ No newline at end of file