fixed the merged/unmerged aliases