fix merge bug

rm merge bug