From afc58aac1ff8149fb52d32becedb5cd031e0500d Mon Sep 17 00:00:00 2001
From: Jaewook Lee <11328376+jaewooklee93@users.noreply.github.com>
Date: Fri, 16 Aug 2024 16:13:04 -0400
Subject: [PATCH] bashrc: resolve merge conflict

---
 linux-bash/bash_aliases.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linux-bash/bash_aliases.sh b/linux-bash/bash_aliases.sh
index 1df4bcf..7e93709 100644
--- a/linux-bash/bash_aliases.sh
+++ b/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 .