Continuing merge.