Functionality moved to background.js
Url Typo
Merging files
Resetting project to own base in prep for manual merge