Conflicts: CHANGELOG.md builds/appchan-x.user.js builds/crx/script.js src/General/Config.coffee src/General/css/style.css