.bash_aliases update
resolve merge conflict