db refactoring
resolve conflict