Remade all conflicts using LINQ.
Add conflict of blank fields in enum conflicts.
Merge pull request #8 from Lozov-Petr/model

Remade conflicts using LINQ.