Add answers.js
Fix merge conflicts