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