fix while merging