Fixed a bunch of stupid merge issues