changes to background.js
merge conflicts