Fixed a few merge errors