fix some merging issue
fix some merging issue