Crucial conflict

Crucial conflict