Further fixed merging