Config changes
resolve conflict