Fixed a few merge mistakes