fixed js conflicts