Background
Saving changes and adding .db files to the git ignore
Resolving conflicts