Merge all the things!

Fix all of these issues with merging and crap