Fix bugs when merge