Merge, apparently