Merge conflicts fixed in content.js