diff --git a/src/cmd/cmdgazebo.rb.in b/src/cmd/cmdgazebo.rb.in
index 07d36a7bb2..ee313ea088 100755
--- a/src/cmd/cmdgazebo.rb.in
+++ b/src/cmd/cmdgazebo.rb.in
@@ -504,9 +504,25 @@ See https://github.com/gazebosim/gz-sim/issues/168 for more info."
               options['wait_gui'], options['render_engine_gui'])
         end
 
+<<<<<<< HEAD:src/cmd/cmdgazebo.rb.in
         Signal.trap("INT") {
           self.killProcess(guiPid, "Ignition Gazebo GUI", 5.0)
           self.killProcess(serverPid, "Ignition Gazebo Server", 5.0)
+=======
+        # Handle SIGINT and SIGTERM signals
+        def handle_signal(guiPid, serverPid)
+          self.killProcess(guiPid, "Gazebo Sim GUI", 5.0)
+          self.killProcess(serverPid, "Gazebo Sim Server", 5.0)
+        end
+
+        Signal.trap("INT") {
+          handle_signal(guiPid, serverPid)
+          return 1
+        }
+
+        Signal.trap("TERM") {
+          handle_signal(guiPid, serverPid)
+>>>>>>> 13bf5bea (Also handle SIGTERM gracefully (#2747)):src/cmd/cmdsim.rb.in
           return 1
         }