Merge mess being cleaned up.