diff --git a/bash_functions b/bash_functions
index ef7af4c..4ea0f9f 100644
--- a/bash_functions
+++ b/bash_functions
@@ -2,6 +2,7 @@ function pips() {
     echo $'\n'$1 >> requirements.txt; pip install $1
 }
 
+<<<<<<< HEAD
 function reset_webstorm(){
     cd ~/.WebStorm*
     rm config/eval/WebStorm*evaluation.key
@@ -10,6 +11,8 @@ function reset_webstorm(){
     rm -rf webstorm
 }
 
+=======
+>>>>>>> parent of 02ed9ee... WS-2017.2 <fergalm@localhost Overwrite remote git@github.com:fergalmoran/dotfiles.git to local
 cb() {
   local _scs_col="\e[0;32m"; local _wrn_col='\e[1;31m'; local _trn_col='\e[0;33m'
   # Check that xclip is installed.
diff --git a/install.sh b/install.sh
index 3fd3af1..3782ad8 100755
--- a/install.sh
+++ b/install.sh
@@ -43,9 +43,12 @@ if [ ! -f $OMF ]; then
     sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 fi
 
+<<<<<<< HEAD
 #install tmux plugin manager
 git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
 
+=======
+>>>>>>> parent of 02ed9ee... WS-2017.2 <fergalm@localhost Overwrite remote git@github.com:fergalmoran/dotfiles.git to local
 #install git flow completion
 git clone https://github.com/bobthecow/git-flow-completion ~/.oh-my-zsh/custom/plugins/git-flow-completion
 
diff --git a/tmux.conf b/tmux.conf
index 2a866f7..85d5693 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -136,6 +136,13 @@ set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 
+<<<<<<< HEAD
 run '~/.tmux/plugins/tpm/tpm'
 
 
+=======
+if "test ! -d ~/.tmux/plugins/tpm" \
+   "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
+
+run '~/.tmux/plugins/tpm/tpm'
+>>>>>>> parent of 02ed9ee... WS-2017.2 <fergalm@localhost Overwrite remote git@github.com:fergalmoran/dotfiles.git to local