fix some merge bug