try to fix sqlite
resolve conflict
resolve conflict