fix some merging issue