Fix whitespace and add aliases

.bashrc

@@ -5,6 +5,7 @@ alias tree="exa --tree"
 alias la="ls -lhA"
 alias calc="qalc"
 alias dedsstore="find . -name \".DS_Store\" -delete"
+alias c="clear"
 
 # History
 HISTSIZE=50000

.gitconfig

@@ -14,6 +14,7 @@
 [alias]
     co = checkout
     amend = commit --amend
+    cf = commit --fixup
     aq = commit --amend --no-edit
     c = commit
     s = status -sb
@@ -42,7 +43,7 @@
     default = simple
 
 [diff]
-	external = difft
+    external = difft
 
 [branch]
     autosetuprebase = always
@@ -58,3 +59,7 @@
 
 [url "ssh://git@gitlab.i.extrahop.com/"]
     insteadOf = https://gitlab.i.extrahop.com/
+
+[merge]
+    conflictstyle = diff3
+