re-add example datababe config file
fix merge conflict