Deconflicting aliases