diff --git a/.bashrc b/.bashrc
index 786aa9c..5b8da69 100755
--- a/.bashrc
+++ b/.bashrc
@@ -28,7 +28,7 @@ alias ll="ls -l"
 alias la="ls -A"
 alias lla="ls -Al"
 alias vl=/usr/share/vim/vimcurrent/macros/less.sh
-alias emacs="emacs -nw"
+alias em="emacs -nw"
 alias apt-get="sudo apt-get"
 alias aptin="apt-get install"
 alias aptsearch="apt-cache search"
@@ -177,7 +177,7 @@ _mygitconfig(){
     git config --global alias.co "checkout"
     git config --global alias.cim "commit --verbose -m"
     git config --global alias.di "diff"
-    git config --global alias.merge "merge --no-ff --stat -v"
+    git config --global alias.me "merge --no-ff --stat -v"
     git config --global alias.ls "!git ls-files | xargs ls -CFG --color=auto --time-style=long-iso"
     git config --global alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso"
     git config --global alias.addi "add -i"