search task complete
db schema
resolve conflict