bashrc: resolve merge conflict

linux-bash/bash_aliases.sh

@@ -7,7 +7,8 @@ alias bat="batcat --paging=never"
 alias my="sudo chown -R $(id -u):$(id -g)"
 
 alias l="command ls -lh --color=auto"
-alias ls="ls -alh --color=auto"
+alias ls="command ls -alh --color=auto"
+
 alias ns="watch -n 0.1 nvidia-smi"
 log() {
     if [ $# -eq 0 ]; then
@@ -91,6 +92,7 @@ alias df="df -h"
 alias status="git status ."
 alias push="git push"
 alias pull="git pull"
+alias fetch="git fetch"
 add() {
     if [ $# -eq 0 ]; then
         git add .