Refactoring in DB
merge