config update
resolve conflict