diff --git a/files/.bashrc b/files/.bashrc
index 0d3d2f5..aab41ff 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -29,7 +29,6 @@ export TERM=xterm-color
 # Alias definitions.
 [[ -f ~/.bash_aliases ]] && . ~/.bash_aliases
 
-<<<<<<< HEAD
 # set PATH so it includes user's private bin if it exists
 [[ -d "$HOME/bin" ]] && PATH+=":$HOME/bin"
 [[ -d "$HOME/.local/bin" ]] && PATH+=":$HOME/.local/bin"