preference changes
resolve conflict