create db using migration and resolved conflict