Fix git conflict
Change gitignore to stop tracking db