Refactoring

fields for conflation simplified