diff --git a/program.py b/program.py
index 8c48a7f..62cebd7 100644
--- a/program.py
+++ b/program.py
@@ -1,2 +1,2 @@
-print('merge conflict')
+print('merge conflict+conflict')
 print ('breaking code')