diff --git a/rcl/CMakeLists.txt b/rcl/CMakeLists.txt
index 7c5b17c0a..9a53e85e2 100644
--- a/rcl/CMakeLists.txt
+++ b/rcl/CMakeLists.txt
@@ -89,7 +89,11 @@ target_include_directories(${PROJECT_NAME} PUBLIC
   "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
 target_link_libraries(${PROJECT_NAME} PUBLIC
   # TODO(clalancette): rcl_interfaces should be PRIVATE, but downstream depends on it for now
+<<<<<<< HEAD
   $<$<NOT:$<BOOL:${RCL_MICROROS}>>:rcl_interfaces::rcl_interfaces>
+=======
+  "$<$<NOT:$<BOOL:${RCL_MICROROS}>>:${rcl_interfaces_TARGETS}>"
+>>>>>>> dc07301 (Fix CMake generator expression)
   # TODO(clalancette): rcl_logging_interface should be PRIVATE, but downstream depends on it for now
   $<$<NOT:$<BOOL:${RCL_MICROROS}>>:rcl_logging_interface::rcl_logging_interface>
   rcutils::rcutils