diff --git a/tests/Makefile.am b/tests/Makefile.am
index f11467955c42664556d25c8b022bd0357d393103..4e474f519f452e1387268427214acc458e5bd4db 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -131,6 +131,11 @@ check_PROGRAMS = check_version check_init check_uuid \
 		 simple_interlock_async_client_2 \
 		 simple_dist_client_1 \
 		 simple_dist_client_2 \
+<<<<<<< HEAD
+=======
+		 simple_dist_client_3 \
+		 simple_dist_client_4 \
+>>>>>>> f51dc7f (solve rebase conflict)
 		 simple_injector \
 		 simple_archiver \
 		 simple_telemetry_listener \