diff --git a/src/common/inbound.c b/src/common/inbound.c
index d3fd4139..169d1689 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -1903,7 +1903,11 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 			else
 			{
 				PrintTextf (serv->server_session,
+<<<<<<< ours
 							_("Invalid STS capability token without value"));
+=======
+							_("Invalid STS capability token without a value; ignoring."));
+>>>>>>> theirs
 			}
 			continue;
 		}