diff --git a/transmission_interface/test/random_generator_utils.hpp b/transmission_interface/test/random_generator_utils.hpp
index d8b48774f4..01e1245e48 100644
--- a/transmission_interface/test/random_generator_utils.hpp
+++ b/transmission_interface/test/random_generator_utils.hpp
@@ -33,11 +33,7 @@ struct RandomDoubleGenerator
   RandomDoubleGenerator(double min_val, double max_val, unsigned int seed = 1234)
   : min_val_(min_val), max_val_(max_val)
   {
-<<<<<<< HEAD
-    srand(time(nullptr));
-=======
     srand(seed);
->>>>>>> ace8416 (Fix flaky transmission_interface tests by making them deterministic. (#1665))
   }
   double operator()()
   {