Fixed js conflicts after assets update