Fixed a few merge bugs