-more config
resolved conflict