Merging normalized DB and is_number into master