solved conflicts get a main

Author: mertcanaltin

src/node_options.h

@@ -128,11 +128,8 @@ class EnvironmentOptions : public Options {
   bool experimental_ffi = false;
   bool experimental_websocket = true;
   bool experimental_sqlite = true;
-<<<<<<< HEAD
   bool experimental_stream_iter = false;
-=======
   bool experimental_logger = false;
->>>>>>> 16da91e1b30 (lib: add logger api in node core)
   bool webstorage = HAVE_SQLITE;
   bool experimental_quic = false;
   std::string localstorage_file;