fixed config conflict