config
solve confilict