Database upgraded, fixed, controller modified, new request can be added to database OHJ
Conflict fixed