Fixed merge bug in appform-js-sdk