Generation development

Conflicts are now identified.