I used the lastest databse scripts from bandile
Removed the merge conflicts