Covering the classes of ModelFields with unit.tests.
Resolving Merge problems.