fixed merging failures