diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index bb7af4af9..4ada46ac6 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -77,7 +77,7 @@ Networking::~Networking()
 
 void Networking::setServerPassword(const std::string &passw) noexcept
 {
-    serverPassword = password.empty() ? TES3MP_DEFAULT_PASSW : password;
+    serverPassword = passw.empty() ? TES3MP_DEFAULT_PASSW : passw;
 }
 
 bool Networking::isPassworded() const
diff --git a/apps/openmw-mp/main.cpp b/apps/openmw-mp/main.cpp
index 12e9b90c1..1b0909ca7 100644
--- a/apps/openmw-mp/main.cpp
+++ b/apps/openmw-mp/main.cpp
@@ -245,13 +245,8 @@ int main(int argc, char *argv[])
 
     try
     {
-<<<<<<< 0.7.0
-        for (auto plugin : plugins)
-            Script::LoadScript(plugin.c_str(), pluginHome.c_str());
-=======
         for (const auto &plugin : plugins)
-            Plugin::LoadPlugin(Utils::convertPath(plugin_home + "/scripts/" + plugin));
->>>>>>> [Server] Rework Plugin API, move Lua system to external library
+            Plugin::LoadPlugin(Utils::convertPath(pluginHome + "/scripts/" + plugin));
 
         switch (peer->Startup((unsigned) players, &sd, 1))
         {