update

js conflict fixed