diff --git a/src/proto/proto.cpp b/src/proto/proto.cpp
index c5b2e7a..ba9706f 100644
--- a/src/proto/proto.cpp
+++ b/src/proto/proto.cpp
@@ -1,7 +1,6 @@
-<<<<<<< Updated upstream
-=======
 //si, bueno, testx
->>>>>>> Stashed changes
+//dos
+
 /*
  * THREADIN THE LINUS: https://linux.die.net/man/2/sched_setaffinity
  */