diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d8ea3ae0c..50f443e9b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -97,6 +97,13 @@ compdef git-svn-dcommit-push=git
 
 alias gsr='git svn rebase'
 alias gsd='git svn dcommit'
+
+function in_git {
+  if $(git status > /dev/null 2>&1); then
+    echo 1
+  fi
+}
+
 #
 # Will return the current branch name
 # Usage example: git pull origin $(current_branch)
diff --git a/themes/netpunk.zsh-theme b/themes/netpunk.zsh-theme
index ec1a1f64c..638044c58 100644
--- a/themes/netpunk.zsh-theme
+++ b/themes/netpunk.zsh-theme
@@ -2,8 +2,11 @@
 # Developed by NETPUNK#, software services
 # http://www.netpunk.net (not up ATM)
 #
+<<<<<<< HEAD
 # Depends on rbenv/rvm, git, mercurial and battery plugins
 #
+=======
+>>>>>>> 473dc4eeb017f7ce6c7057da588bf39337beb4be
 # License: MIT
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
@@ -15,13 +18,33 @@
 # THE SOFTWARE.
 ##
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 473dc4eeb017f7ce6c7057da588bf39337beb4be
 function prompt_char {
     git branch >/dev/null 2>/dev/null && echo 'GIT ☢ ↪' && return
     hg root >/dev/null 2>/dev/null && echo 'HG ☢ ↪' && return
     echo ' ☢ ↪'
 }
+<<<<<<< HEAD
 
+=======
+function battery_charge {
+    if [ -e /usr/local/bin/batcharge.py ]
+    then
+        echo `python /usr/local/bin/batcharge.py`
+    else
+        echo '';
+    fi
+}
+
+function hg_prompt_info {
+  if [ $(in_hg) ]; then
+    hg prompt "{rev}:{node|short} on {root|basename}/{branch} {task} {status} {update} {patch|count|unapplied} {incoming changes{incoming|count}} " 2>/dev/null
+  fi
+}
+>>>>>>> 473dc4eeb017f7ce6c7057da588bf39337beb4be
 if which rvm-prompt &> /dev/null; then
   PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%} %~ %{$reset_color%}$(hg_prompt_info)$(git_prompt_info)%{$reset_color%}
    $(prompt_char)  '
@@ -29,7 +52,11 @@ if which rvm-prompt &> /dev/null; then
 elif which rbenv &> /dev/null; then
   PROMPT='%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%} %~ %{$reset_color%}$(hg_prompt_info)$(git_prompt_info)%{$reset_color%}
    $(prompt_char)  '
+<<<<<<< HEAD
   RPROMPT='%{$fg[red]%}RB $(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%} %{$fg[magenta]%}$(date "+%Y-%m-%d")%{$reset_color%} $(battery_pct_prompt)'
+=======
+  RPROMPT='%{$fg[red]%}RB $(rbenv version | sed -e "s/ (set.*$//")%{$reset_color%} %{$fg[magenta]%}$(date "+%Y-%m-%d")%{$reset_color%} %{$fg[green]%} BAT: %{$reset_color%} $(battery_charge)'
+>>>>>>> 473dc4eeb017f7ce6c7057da588bf39337beb4be
 
 fi