[F] Fix conflicts

Author: hykilpikonna

src/main/java/org/hydev/mcpm/client/DatabaseManager.java

@@ -78,8 +78,6 @@ public boolean checkPluginInstalledByVersion(PluginVersion pluginVersion) {
      * */
     public void addManualInstalled(long id, PluginVersion pluginVersion, boolean isManuallyInstalled) {
         localPluginTracker.addEntry(pluginVersion.meta().name(),
-                isManuallyInstalled,
-                pluginVersion.id() + "",
-                id + "");
+                isManuallyInstalled, pluginVersion.id(), id);
     }
 }