diff --git a/kernel/atomsem.c b/kernel/atomsem.c
index db1c2be..9d1bab5 100755
--- a/kernel/atomsem.c
+++ b/kernel/atomsem.c
@@ -87,6 +87,12 @@
  *
  */
 
+<<<<<<< HEAD
+=======
+#ifndef STAND_ALONE
+#include <stdio.h>
+#endif
+>>>>>>> Change related to upstream merge.
 
 #include "atom.h"
 #include "atomsem.h"
diff --git a/tests/test-template.c b/tests/test-template.c
index 9f00f38..449af59 100644
--- a/tests/test-template.c
+++ b/tests/test-template.c
@@ -31,7 +31,6 @@
 #include "atom.h"
 #include "atomtests.h"
 
-
 /**
  * \b test_start
  *