diff --git a/.bashrc b/.bashrc
index 83e76e9..6b6468d 100644
--- a/.bashrc
+++ b/.bashrc
@@ -113,17 +113,13 @@ alias gr='git reset HEAD'
 alias gc='git commit -v'
 alias gd='git difftool'
 alias gl='git log --graph --oneline --format="%C(yellow)%h %C(green)%an%Creset %C(blue)%ad%Creset %s"'
-<<<<<<< HEAD
 vc() {
     git add .
     git commit -m "vault backup: $(date "+%Y-%m-%d %H:%M:%S")"
-    git push
 }
-=======
 alias cj='cd ~/storage/shared/Documents/journal/'
 alias jr='cd ~/storage/shared/Documents/journal/ && git pull && vc && cd -'
 alias hc='cd ~/storage/shared/Documents/hc_notes/ && git pull && git push && cd -'
->>>>>>> c7bc5d1f60c8611a1f5a7e85b2cd5495696adc8e
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
@@ -156,10 +152,10 @@ PAGER="less"
 LESS="-S"
 export PSQL_PAGER="pspg"
 
-#if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
-#    GIT_PROMPT_ONLY_IN_REPO=1
-#    source $HOME/.bash-git-prompt/gitprompt.sh
-#fi
+if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
+    GIT_PROMPT_ONLY_IN_REPO=1
+    source $HOME/.bash-git-prompt/gitprompt.sh
+fi
 
 bind 'set bell-style none'