fixed merging ...