diff --git a/digits.txt b/digits.txt
index 0bce9e3..80d7a62 100644
--- a/digits.txt
+++ b/digits.txt
@@ -4,4 +4,8 @@
 4
 5
 6
-7
\ No newline at end of file
+<<<<<<< HEAD
+7
+=======
+7
+>>>>>>> 197f70012b2485a77f1a223ea32ea3c9c3bfafde