fix merge conflicts with tests

tests/testdata/outputs_expected/overflow.sol.o.json

@@ -1,7 +1,6 @@
 {
 	"error": null,
 	"issues": [{
-		"SourceMap": null,
 		"address": 567,
 		"contract": "Unknown",
 		"debug": "<DEBUG-DATA>",
@@ -10,10 +9,10 @@
 		"max_gas_used": 1774,
 		"min_gas_used": 1299,
 		"severity": "High",
+		"sourceMap": null,
 		"swc-id": "101",
 		"title": "Integer Underflow"
 	}, {
-		"SourceMap": null,
 		"address": 649,
 		"contract": "Unknown",
 		"debug": "<DEBUG-DATA>",
@@ -22,6 +21,7 @@
 		"max_gas_used": 1774,
 		"min_gas_used": 1299,
 		"severity": "High",
+		"sourceMap": null,
 		"swc-id": "101",
 		"title": "Integer Underflow"
 	}],

tests/testdata/outputs_expected/overflow.sol.o.jsonv2

@@ -1,27 +1,27 @@
 {
 	"issues": [{
 		"description": {
-			"head": ["The subtraction can underflow."],
-			"tail": ["The binary subtraction operation can result in an integer underflow.\n"]
+			"head": "The subtraction can underflow.",
+			"tail": "The binary subtraction operation can result in an integer underflow.\n"
 		},
 		"extra": {},
 		"locations": [{
 			"sourceMap": "567:1:0"
 		}],
 		"severity": "High",
-		"swcID": "101",
+		"swcID": "SWC-101",
 		"swcTitle": "Integer Overflow and Underflow"
 	}, {
 		"description": {
-			"head": ["The subtraction can underflow."],
-			"tail": ["The binary subtraction operation can result in an integer underflow.\n"]
+			"head": "The subtraction can underflow.",
+			"tail": "The binary subtraction operation can result in an integer underflow.\n"
 		},
 		"extra": {},
 		"locations": [{
 			"sourceMap": "649:1:0"
 		}],
 		"severity": "High",
-		"swcID": "101",
+		"swcID": "SWC-101",
 		"swcTitle": "Integer Overflow and Underflow"
 	}],
 	"meta": {},

tests/testdata/outputs_expected/underflow.sol.o.json

@@ -1,7 +1,6 @@
 {
 	"error": null,
 	"issues": [{
-		"SourceMap": null,
 		"address": 567,
 		"contract": "Unknown",
 		"debug": "<DEBUG-DATA>",
@@ -10,10 +9,10 @@
 		"max_gas_used": 1774,
 		"min_gas_used": 1299,
 		"severity": "High",
+		"sourceMap": null,
 		"swc-id": "101",
 		"title": "Integer Underflow"
 	}, {
-		"SourceMap": null,
 		"address": 649,
 		"contract": "Unknown",
 		"debug": "<DEBUG-DATA>",
@@ -22,6 +21,7 @@
 		"max_gas_used": 1774,
 		"min_gas_used": 1299,
 		"severity": "High",
+		"sourceMap": null,
 		"swc-id": "101",
 		"title": "Integer Underflow"
 	}],