diff --git a/makefile b/makefile
index 14350807..c358caba 100644
--- a/makefile
+++ b/makefile
@@ -197,15 +197,9 @@ c99:
 	-e 's/(mp_i64)((mp_u64)1<<63)/INT64_MIN/g' \
 	-e 's/(mp_i64)(((mp_u64)1<<63)-1)/INT64_MAX/g' \
 	-e 's/((size_t)-1)/SIZE_MAX/g' \
-<<<<<<< HEAD
-	-e 's/MP_\(PRI[ioux]64\)/\1/g' \
-||||||| constructed merge base
-	-e 's/MP_\(PRI[iux]64\)/\1/g' \
-=======
         -e 's/__intmax_t/intmax_t/g'  \
         -e 's/__uintmax_t/uintmax_t/g'  \
 	-e 's/MP_\(PRI[iuox]64\)/\1/g' \
->>>>>>> Extended c89 handling
 	-e 's/mp_u\([0-9][0-9]*\)/uint\1_t/g' \
 	-e 's/mp_i\([0-9][0-9]*\)/int\1_t/g' \
 	-e 's/MP_FUNCTION_NAME/__func__/g' \
diff --git a/s_mp_fprintf.c b/s_mp_fprintf.c
index 77ac7d33..909ccee3 100644
--- a/s_mp_fprintf.c
+++ b/s_mp_fprintf.c
@@ -18,7 +18,7 @@
 
 /* Step to the next character, throw error if there is none  */
 #define LTM_NEXT_ERROR(x) do{(x)++;if(*(x) == '\0'){goto LTM_ERR;}}while(0)
-/* Step to the next character, got to end if there is none  */
+/* Step to the next character, go to end if there is none  */
 #define LTM_NEXT(x) do{(x)++;if(*(x) == '\0')break;}while(0)
 
 /* The size of the string "%..." is not very large */