diff --git a/core/thread.c b/core/thread.c
index 6dccbedf952e..430130d761ed 100644
--- a/core/thread.c
+++ b/core/thread.c
@@ -234,7 +234,6 @@ kernel_pid_t thread_create(char *stack, int stacksize, uint8_t priority,
 
 #if defined(DEVELHELP) || defined(SCHED_TEST_STACK) \
     || defined(MODULE_TEST_UTILS_PRINT_STACK_USAGE)
->>>>>>> 9c7658a117 (core: add support for test_utils_print_stack_usage)
     if (flags & THREAD_CREATE_STACKTEST) {
         /* assign each int of the stack the value of it's address. Alignment
          * has been handled above, so silence -Wcast-align */