fixed merging issue