diff --git a/files/.bash_aliases b/files/.bash_aliases
index 2894bc6..784abb5 100644
--- a/files/.bash_aliases
+++ b/files/.bash_aliases
@@ -4,7 +4,7 @@ alias dprune='docker image prune -f'
 alias dcrestart='docker compose down --remove-orphans && docker compose up -d'
 
 alias docker='docker '
-alias ps='ps -a --format "table {{.Names}}:\t{{.State}}\t{{.Status}}"'
+alias ps='ps -a --format "table {{.Names}}:\t{{.State}}"'
 
 alias ncht='docker exec -it --user www-data app-server php occ maintenance:update:htaccess'
 
diff --git a/files/.bashrc b/files/.bashrc
index 68ce2ff..0d3d2f5 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -29,10 +29,17 @@ 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"
 [[ -d "$HOME/scipts/bin" ]] && PATH+=":$HOME/scripts/bin"
+=======
+# set PATH so it includes certain bin folders if they exist
+[[ -d ~/bin ]] && PATH+=":$HOME/bin"
+[[ -d ~/.local/bin ]] && PATH+=":$HOME/.local/bin"
+[[ -d /usr/local/go/bin ]] && PATH+=":/usr/local/go/bin"
+>>>>>>> 574ac34e491aaaad429e0df90280e7a0b5e8c7f5
 
 # source misc user scripts
 if [ -d ~/git/dotfiles/source ]; then
@@ -40,17 +47,14 @@ if [ -d ~/git/dotfiles/source ]; then
 fi
 
 # set prompt colors and style
-if [ -f ~/.PS1 ]; then
-	source ~/.PS1
-else
-	PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
-fi
+[[ -f ~/.PS1 ]] && . ~/.PS1 ||
+PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]$ '
 
 # fetch uninstalled package names when attempting command (arch only)
-if [ -f /usr/share/doc/pkgfile/command-not-found.bash ]; then
-	source /usr/share/doc/pkgfile/command-not-found.bash
-fi
+PKG_COMP=/usr/share/doc/pkgfile/command-not-found.bash
+[[ -f $PKG_COMP ]] && . $PKG_COMP
 
+# source fzf scripts
 if [ -d ~/.fzf ]; then
 	source ~/.fzf/completion.bash
 	source ~/.fzf/key-bindings.bash
diff --git a/files/.nanorc b/files/.nanorc
index ed8835d..17dd1e6 100644
--- a/files/.nanorc
+++ b/files/.nanorc
@@ -14,12 +14,12 @@
 
 ## When soft line wrapping is enabled, make it wrap lines at blanks
 ## (tabs and spaces) instead of always at the edge of the screen.
-# set atblanks
+set atblanks
 
 ## Automatically indent a newly created line to the same number of
 ## tabs and/or spaces as the preceding line -- or as the next line
 ## if the preceding line is the beginning of a paragraph.
-# set autoindent
+set autoindent
 
 ## Back up files to the current filename plus a tilde.
 # set backup
@@ -102,7 +102,7 @@ set linenumbers
 # set multibuffer
 
 ## Don't convert files from DOS/Mac format.
-# set noconvert
+set noconvert
 
 ## Don't display the helpful shortcut lists at the bottom of the screen.
 # set nohelp