Add alias
Fix merge conflict on aliases.