Merge, again