updated git ignore file to ignore the database
fixed conflicts in .gitignore file