gitignore config db
conflict ok