try to fix sqlite
resolve conflict