diff --git a/fake_home/.shell_aliases b/fake_home/.shell_aliases
index 7abe2fd..ecd2d20 100755
--- a/fake_home/.shell_aliases
+++ b/fake_home/.shell_aliases
@@ -47,12 +47,9 @@ function ww {
     ws $(rg --no-line-number --no-filename . ~/wiki | sed 's/[^a-zA-Z0-9]\+/\n/g' | grep -v "^$" | sort -f | uniq -ci | sort -hr | fzf -i | cut -c 9-)
 }
 
-<<<<<<< HEAD
-=======
 if command -v bat; then
     alias cat="bat -p"
 fi
->>>>>>> 12ed01fb9697f14a24fde45d561a42e4b71d3cf1
 export FZF_DEFAULT_COMMAND='fd --type f'
 alias fzf="fzf --preview 'bat --style=numbers --color=always {}'"