Fixed all the messed up branch merge stuff, ugh...