global DB change. Now all in one file. Also some changes in AddRoute. And .ignoregit
Conflict in query solved!