Resolving conflcts in models