fix bugs

fix bugs work in all browser
wrong file

wrong file conflict issue