minor change and conflict fix