Fixed a few merge issues