diff --git a/rclpy/rclpy/action/server.py b/rclpy/rclpy/action/server.py
index abcfb96cc..32e6410f9 100644
--- a/rclpy/rclpy/action/server.py
+++ b/rclpy/rclpy/action/server.py
@@ -148,12 +148,27 @@ def publish_feedback(self, feedback):
 
     def succeed(self):
         self._update_state(_rclpy.GoalEvent.SUCCEED)
+<<<<<<< HEAD
+=======
+        if response is not None:
+            self._set_result(response)
+>>>>>>> a348801 (Prevents the Future result from being set twice. (#1599))
 
     def abort(self):
         self._update_state(_rclpy.GoalEvent.ABORT)
+<<<<<<< HEAD
+=======
+        if response is not None:
+            self._set_result(response)
+>>>>>>> a348801 (Prevents the Future result from being set twice. (#1599))
 
     def canceled(self):
         self._update_state(_rclpy.GoalEvent.CANCELED)
+<<<<<<< HEAD
+=======
+        if response is not None:
+            self._set_result(response)
+>>>>>>> a348801 (Prevents the Future result from being set twice. (#1599))
 
     def destroy(self):
         with self._lock: