Improving DB
Solving conflicts