merge Bertrand and lingling's makedb file