diff --git a/src/proto/proto.cpp b/src/proto/proto.cpp
index 0e21d36..a36de82 100644
--- a/src/proto/proto.cpp
+++ b/src/proto/proto.cpp
@@ -1,19 +1,6 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 //si, bueno, testx
 //dossPxa
 
-=======
-<<<<<<< Updated upstream
-=======
-//si, bueno, testx
->>>>>>> Stashed changes
->>>>>>> 0ff6488 (linus comes into play)
-=======
-//si, bueno, testx
-//dossPxa
-
->>>>>>> f35615e (ya)
 /*
  * THREADIN THE LINUS: https://linux.die.net/man/2/sched_setaffinity
  */