shared database config
conflict fix