Blah fix merge problem with db file