diff --git a/apps/htop/rc b/apps/htop/rc
index f96fb4f..3991198 100644
--- a/apps/htop/rc
+++ b/apps/htop/rc
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
 fields=0 48 17 18 38 39 40 2 46 47 49 1
@@ -25,3 +26,33 @@ left_meter_modes=1 1 1
 right_meters=RightCPUs2 Tasks LoadAverage Uptime
 right_meter_modes=1 2 2 2
 vim_mode=1
+||||||| bc5ce9e
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+fields=0 48 17 18 38 39 40 2 46 47 49 1
+sort_key=46
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=1
+shadow_other_users=0
+show_thread_names=0
+show_program_path=0
+highlight_base_name=1
+highlight_megabytes=1
+highlight_threads=1
+tree_view=1
+header_margin=1
+detailed_cpu_time=0
+cpu_count_from_zero=0
+update_process_names=0
+account_guest_in_cpu_meter=0
+color_scheme=0
+delay=15
+left_meters=LeftCPUs2 Memory Swap
+left_meter_modes=1 1 1
+right_meters=RightCPUs2 Tasks LoadAverage Uptime
+right_meter_modes=1 2 2 2
+vim_mode=1
+=======
+>>>>>>> 0d0e131714c756be933e158919908c19e0c35b2b
diff --git a/apps/shell/bash/aliases.bash b/apps/shell/bash/aliases.bash
index 1815d79..46e2683 100644
--- a/apps/shell/bash/aliases.bash
+++ b/apps/shell/bash/aliases.bash
@@ -119,10 +119,17 @@ alias sctlu="systemctl --user"
 alias logs="sudo journalctl"
 alias logsr="sudo journalctl -r"
 alias logsf="sudo journalctl -f"
+<<<<<<< HEAD:apps/shell/bash/aliases.bash
 alias bt="sudo bluetoothctl"
 alias btctl="bt"
 alias btctl="sudo bluetoothctl"
 alias pbcopy="clip"
+||||||| bc5ce9e:shell/bash/aliases
+alias btctl="sudo bluetoothctl"
+=======
+alias bt="sudo bluetoothctl"
+alias btctl="bt"
+>>>>>>> 0d0e131714c756be933e158919908c19e0c35b2b:shell/bash/aliases
 alias pt="htop -t" # experimental htop tree-view-by-default
 alias resrc="source \$HOME/.bashrc"
 alias redshift="redshift -r -l 39.0997:-94.5786 -t 6500K:2500K"
diff --git a/bin/pipeline b/bin/pipeline
index dff7961..99e07c6 100755
--- a/bin/pipeline
+++ b/bin/pipeline
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #!/usr/bin/env bash
 
 SAVED_PIPELINE_DIR="$DOTFILES_PATH/bin/pipelines"
@@ -65,3 +66,73 @@ nvim \
 	--cmd 'set updatetime=250' \
 	--cmd 'autocmd CursorHold,CursorHoldI <buffer> silent write' \
 	--cmd "$(<<< "$job" tr "'" '"')"
+||||||| bc5ce9e
+=======
+#!/usr/bin/env bash
+
+SAVED_PIPELINE_DIR="$EDFP/pipelines"
+mkdir -p "$SAVED_PIPELINE_DIR"
+
+if [[ ! -z "${1+x}" ]]; then
+	pdir="$SAVED_PIPELINE_DIR/$1"; shift
+	mkdir -p "$pdir"
+	if [[ -z ${1+x} ]]; then
+		td="$(mktemp -p "$pdir" -d "tmp_pipeline.XXXXXXXX")"
+		cleanup_trap="rm -rf \"$td\""
+	else
+		td="$pdir/$1"; shift
+		mkdir -p "$td"
+	fi
+	transform="$pdir/transform"
+else
+	td="$(mktemp --tmpdir -d pipeline.XXXXXXXX)"
+	transform="$td/transform"
+	cleanup_trap="rm -rf \"$td\""
+fi
+
+if [[ ! -e "$transform" ]]; then
+	echo -e "#!/usr/bin/env bash\n# for ${td}\n\nbase64" > "$transform"
+fi
+
+in="$td/in"
+if [[ ! -z "${1+x}" ]]; then
+	in="${1}"; shift
+fi
+out="$td/out"
+if [[ ! -z "${1+x}" ]]; then
+	out="${1}"; shift
+fi
+
+# TODO: if no logging, log="/dev/null"
+log="$td/log"
+
+chmod +x "$transform"
+echo "Hello World" > "$in"
+touch "$log"
+
+fswi \
+	"bash -c 'cd \"$td\" && < \"$in\" \"$transform\" | tee \"$out\"'" \
+	'in$|transform$' \
+	"$td" "$pdir" &> "$log" &
+watcher="$!"
+
+if [[ -z ${cleanup_trap+x} ]]; then
+	trap "kill \"$watcher\"" EXIT
+else
+	trap "${cleanup_trap}; kill \"$watcher\"" EXIT
+fi
+
+job="call jobstart(['inotifywait', '-m', '-e', 'close_write', '${out}'], {'on_stdout':{j,d,e->execute('checktime')}})"
+
+# this will only autosave (and therefore autoreload) for the out buffer (since
+# it was opened last) - autosaving (and therefore autorunning) is potentially
+# very scary
+nvim \
+	--cmd 'set shm+=atIWF' \
+	--cmd 'set shm-=Oo' \
+	-o "$in" "$transform" "$out" \
+	--cmd 'set autoread' \
+	--cmd 'set updatetime=250' \
+	--cmd 'autocmd CursorHold,CursorHoldI <buffer> silent write' \
+	--cmd "$(<<< "$job" tr "'" '"')"
+>>>>>>> 0d0e131714c756be933e158919908c19e0c35b2b
diff --git a/bin/upload b/bin/upload
index c6ec490..2ffaefb 100755
--- a/bin/upload
+++ b/bin/upload
@@ -2,6 +2,8 @@
 
 # TODO: progress bar!
 
+# TODO: progress bar!
+
 HOST="ld"
 
 f="${1}"
diff --git a/setup.bash b/setup.bash
index 3fbcc3f..845c32d 100755
--- a/setup.bash
+++ b/setup.bash
@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 
+<<<<<<< HEAD:setup.bash
 # TODO: quiet/auto-agree mode for curl | bash automagic?
+||||||| bc5ce9e:setup
+# TODO: ascii art header since I'm a leet haxx0r
+=======
+# TODO: ascii art header since I'm a leet haxx0r
+# TODO: quiet mode?
+>>>>>>> 0d0e131714c756be933e158919908c19e0c35b2b:setup
 
 dfp=$(cd "$(dirname "${BASH_SOURCE[0]}" )/" && pwd)
 source "${dfp}/bin/lib/setup_helpers.bash"