Testing git merging
DB not in sync