Handle situations where removed fields conflict with names of new associators
Merge branch 'master' of github.com:deepwinter/lattice