Added an alias.
Resolved conflicts.