diff --git a/SaveLoad/snakedata.txt b/SaveLoad/snakedata.txt
index 7baea5d39aab98476a2d24aa6c7d884797ec36ff..7133a9faf26461d6dcaf39034b29705b30961582 100644
--- a/SaveLoad/snakedata.txt
+++ b/SaveLoad/snakedata.txt
@@ -11,6 +11,10 @@ aaa	10
 aaa	5
 sss	5
 aaa	1
+<<<<<<< HEAD
 kko	1
 dip	0
 mko	0
+=======
+333	1
+>>>>>>> fc264501b79903cb57a079b480e7ac94eef1901c