database created
conflict resolution