js-assets shifted
fixed conflict versions