Fixed a couple of merging issues