fixing failed merge in updatedatabase