try to fix bugs after merge

try to fix bugs after merge