remove db
resolve conflict