fix merge code to work with new database names