diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 002933d..467d833 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -681,7 +681,7 @@
 	\ "call prop_type_add('background', {'highlight': 'BackgroundProp', 'combine': 0})",
 	\ "call prop_type_add('backgroundcomb', {'highlight': 'NumberProp', 'combine': 1})",
 	\ "eval 'backgroundcomb'->prop_type_change({'highlight': 'BackgroundProp'})",
-	\ "call prop_type_add('error', {'highlight': 'UnderlineProp', 'combine': 1})",
+	\ "call prop_type_add('error', {'highlight': 'UnderlineProp'})",
 	\ "call prop_add(1, 4, {'end_lnum': 3, 'end_col': 3, 'type': 'long'})",
 	\ "call prop_add(2, 9, {'length': 3, 'type': 'number'})",
 	\ "call prop_add(2, 24, {'length': 4, 'type': 'number'})",
diff --git a/src/version.c b/src/version.c
index ae85a95..314f164 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2296,
+/**/
     2295,
 /**/
     2294,