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