merge conflicts... yay git is just so amazing at merging... NOT FIXEDgit add -A