ignore js-build
fixed conflict