fixed some merging issue