Preferences Mint
Resolve conflict