fix issue while merging