Conflicts: CHANGELOG.md LICENSE builds/4chan-X.user.js builds/appchan-x.user.js builds/crx/script.js src/General/Main.coffee src/Miscellaneous/Emoji.coffee
Conflicts: CHANGELOG.md LICENSE builds/4chan-X.user.js builds/appchan-x.user.js builds/crx/script.js src/General/Main.coffee src/Miscellaneous/Emoji.coffee