sqlite and git merge