diff --git a/CursedScreech/js/module.js b/CursedScreech/js/module.js
index 1c3c94a..15425dc 100755
--- a/CursedScreech/js/module.js
+++ b/CursedScreech/js/module.js
@@ -684,12 +684,19 @@ registerController('CursedScreechController', ['$api', '$scope', '$sce', '$inter
 			transformRequest: angular.identity,
 			headers: {'Content-Type': undefined}
 		}).then(function(response) {
+<<<<<<< HEAD
 			var errors = {};
 			for (var key in response.data) {
 				if (response.data[key].success == "Failed") {
 					var msg = response.data[key].message + '\n';
 					if (!errors.hasOwnProperty(msg)) {
 						errors[msg] = true;
+=======
+			for (var key in response) {
+				if (response.hasOwnProperty(key)) {
+					if (response.key == "Failed") {
+						alert("Failed to upload " + key);
+>>>>>>> upstream/master
 					}
 				}
 			}
diff --git a/CursedScreech/module.info b/CursedScreech/module.info
index 8dcf583..68a1b8e 100755
--- a/CursedScreech/module.info
+++ b/CursedScreech/module.info
@@ -6,5 +6,9 @@
         "tetra"
     ],
     "title": "CursedScreech",
+<<<<<<< HEAD
     "version": "1.4"
+=======
+    "version": "1.3"
+>>>>>>> upstream/master
 }
diff --git a/PortalAuth/js/module.js b/PortalAuth/js/module.js
index 4c60ddb..b712858 100755
--- a/PortalAuth/js/module.js
+++ b/PortalAuth/js/module.js
@@ -641,12 +641,19 @@ registerController('PortalAuthController', ['$api', '$scope', '$sce', '$interval
 			transformRequest: angular.identity,
 			headers: {'Content-Type': undefined}
 		}).then(function(response) {
+<<<<<<< HEAD
 			var errors = {};
 			for (var key in response.data) {
 				if (response.data[key].success == "Failed") {
 					var msg = response.data[key].message + '\n';
 					if (!errors.hasOwnProperty(msg)) {
 						errors[msg] = true;
+=======
+			for (var key in response) {
+				if (response.hasOwnProperty(key)) {
+					if (response.key == "Failed") {
+						alert("Failed to upload " + key);
+>>>>>>> upstream/master
 					}
 				}
 			}
diff --git a/PortalAuth/module.info b/PortalAuth/module.info
index 01128f1..8360766 100755
--- a/PortalAuth/module.info
+++ b/PortalAuth/module.info
@@ -6,5 +6,9 @@
         "tetra"
     ],
     "title": "Portal Auth",
+<<<<<<< HEAD
     "version": "1.6"
+=======
+    "version": "1.5"
+>>>>>>> upstream/master
 }
\ No newline at end of file
diff --git a/nmap/api/module.php b/nmap/api/module.php
index 259c0eb..2ba1ae3 100644
--- a/nmap/api/module.php
+++ b/nmap/api/module.php
@@ -61,6 +61,9 @@ class nmap extends Module
 
     private function handleDependencies()
     {
+    	if (!file_exists("/usr/lib/libpcap.so.1.3") && file_exists("/usr/lib/libpcap.so")) {
+            symlink("/usr/lib/libpcap.so", "/usr/lib/libpcap.so.1.3");
+        }
 		if(!$this->checkDependency("nmap"))
 		{
 	        $this->execBackground("/pineapple/modules/nmap/scripts/dependencies.sh install ".$this->request->destination);
diff --git a/nmap/module.info b/nmap/module.info
index 4e04263..3858736 100644
--- a/nmap/module.info
+++ b/nmap/module.info
@@ -6,5 +6,5 @@
         "tetra"
     ],
     "title": "nmap",
-    "version": "1.4"
+    "version": "1.5"
 }
\ No newline at end of file