fix bug when merge
fix