diff --git a/test.py b/test.py
index 59bcf23..e66c830 100644
--- a/test.py
+++ b/test.py
@@ -1,3 +1,9 @@
 a=25
 b=20
+c=90
+<<<<<<< HEAD
+pricilla
+=======
+kevin 2005
+>>>>>>> df93c131a6494e2c96ca1f7c8132b9bbd42589cf
 print (a+b)