diff --git a/server.c b/server.c
index 2d91219520..f1b848be02 100644
--- a/server.c
+++ b/server.c
@@ -2743,9 +2743,15 @@ static void set_sig_handlers(void)
 	struct sigaction act = {
 		.sa_handler = sig_int,
 		#if defined(__QNX__)
+<<<<<<< HEAD
 		act.sa_flags = SA_NOCLDSTOP,
 		#else
 		act.sa_flags = SA_RESTART,
+=======
+		.sa_flags = SA_NOCLDSTOP,
+		#else
+		.sa_flags = SA_RESTART,
+>>>>>>> Support platform QNX OS
 		#endif
 	};