Fixed a bunch of merge errors