resolve config conflict