fix dare string set bug
fix conflict