Resolve conflicts in aliases.