Add jsdoc and resolve conflict