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