Fix merging aliases