db save
conflict resolved
tables added