diff --git a/test b/test
index 29e7f0c..9a4ca81 100644
--- a/test
+++ b/test
@@ -1,9 +1,7 @@
 abc
 nowa linia
-<<<<<<< HEAD
 1235
 87654
-
-=======
 to jest kolejna linia do dodania
->>>>>>> 6ec80f589cc40981565228be3cbb234349595387
+no i nowe coś... i nowe
+