.gitignore: Ignoring database file
Merging