fix error while merging