Issue #186

When branding conflicts