fixed merging with links