mail integration
conflict resolution