fix merge fail
cosmetic
v4.0.6