8236226: fix merge error in src/hotspot/share/gc/z/zRootsIterator.cpp

Reviewed-by: dholmes, kbarrett

Author: Daniel D. Daugherty

src/hotspot/share/gc/z/zRootsIterator.cpp

@@ -44,7 +44,8 @@
 #include "memory/universe.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/resolvedMethodTable.hpp"
-#include "runtime/atomic.hpp"#include "runtime/safepoint.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/safepoint.hpp"
 #include "runtime/synchronizer.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/vmThread.hpp"