diff --git a/CursedScreech/js/module.js b/CursedScreech/js/module.js
index 15425dc..1c3c94a 100755
--- a/CursedScreech/js/module.js
+++ b/CursedScreech/js/module.js
@@ -684,19 +684,12 @@ 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 68a1b8e..8dcf583 100755
--- a/CursedScreech/module.info
+++ b/CursedScreech/module.info
@@ -6,9 +6,5 @@
         "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 b712858..4c60ddb 100755
--- a/PortalAuth/js/module.js
+++ b/PortalAuth/js/module.js
@@ -641,19 +641,12 @@ 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 8360766..01128f1 100755
--- a/PortalAuth/module.info
+++ b/PortalAuth/module.info
@@ -6,9 +6,5 @@
         "tetra"
     ],
     "title": "Portal Auth",
-<<<<<<< HEAD
     "version": "1.6"
-=======
-    "version": "1.5"
->>>>>>> upstream/master
 }
\ No newline at end of file