Fixes Issue 441: 	Change default option to see events from other users.
You can disable conflict creation for selected conflicts
conflict supression works correctly with xml.