diff --git a/demo.py b/demo.py
index aa6c67c..0cfb589 100644
--- a/demo.py
+++ b/demo.py
@@ -1,2 +1,5 @@
-a + b +c
+
+=======
+a + b =a-b-a
+>>>>>>> dd958f316cd7e54857f900b67465c32e02cce734
 
diff --git a/sweet.py b/sweet.py
new file mode 100644
index 0000000..5929e19
--- /dev/null
+++ b/sweet.py
@@ -0,0 +1 @@
+print(hello kjc)