Fix merge errors

Author: fregante

package.json

@@ -86,7 +86,7 @@
 	"alias": {
 		"these-are-just-mocks-for-parcel-tests": "yolo",
 		"webext-additional-permissions": "./test/demo-extension/webext-additional-permissions.js",
-		"webext-dynamic-content-scripts": "./source/index.ts",
+		"webext-dynamic-content-scripts": "./source/",
 		"./source/*.js": "./source/$1.ts"
 	},
 	"targets": {

source/active-tab.ts

@@ -1,5 +1,5 @@
 import {isScriptableUrl} from 'webext-content-scripts';
-import {SimpleEventTarget} from '../simple-event-target';
+import {SimpleEventTarget} from './simple-event-target';
 
 type TabId = number;
 type Origin = string;