Resolve conflict

GoodByeWorld.cpp

 // Autor: MATSE
 
 #include <iostream>
+#include <string>
+
+string hello = "こんにちは、 世界！";
 
 int main() {
-    std::cout << "こんにちは、 世界！";
+    std::cout << hello;
     return 0;
 }
\ No newline at end of file