Resolution conflits + domain model