Events Calendar - Conflict Resolution