1 files changed, 1 insertions, 5 deletions

diff --git a/nivel.txt b/nivel.txt
index f131ba1..d00491f 100644
--- a/nivel.txt
+++ b/nivel.txt
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
-3
-=======
-2
->>>>>>> Stashed changes
+1