fixed typo
remove browser()
fix merge conflict