diff --git a/tests/suites/test_suite_timing.function b/tests/suites/test_suite_timing.function
index 6e949c8..1610155 100644
--- a/tests/suites/test_suite_timing.function
+++ b/tests/suites/test_suite_timing.function
@@ -53,7 +53,6 @@
  * END_DEPENDENCIES
  */
 
-<<<<<<< HEAD
 /* BEGIN_CASE */
 void timing_timer_simple( )
 {