Add chosen.js, fix merge conflict