put global values into DB
works on macs
Fix merge conflict