modify some ut
remove flush
fix conflicts