diff --git a/asm/preproc.c b/asm/preproc.c
index 85606e05f..56dbc48e8 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -156,14 +156,10 @@ static bool is_smac_param(enum token_type toktype)
  * We prohibit tokens of length > MAX_TEXT even though length here is
  * an unsigned int; this avoids problems if the length is passed
  * through an interface with type "int", and is absurdly large anyway.
-<<<<<<< Updated upstream
+ *
  * Use INT_MAX >> 2 to try to at least try to avoid risking wraparound
  * even in the fairly extreme case when "int" is incorrectly used and
  * two lengths are added. That is still 512GB with a 32-bit int...
-=======
- * Use INT_MAX >> 1 to try to at least try to avoid risking wraparound
- * even when "int" is incorrectly used.
->>>>>>> Stashed changes
  *
  * Earlier versions of the source code incorrectly stated that
  * examining the text string alone can be unconditionally valid. This