fix jsdoc
fix merge conflict