Attempting another merge.