fixed config merge conflict