fix bug when merge