merged, finally, for real