Added and modified aliases.
Conflict in bash aliases