fixed merging fails