Fixed a couple random merging bugs