initial branding
fixed conflict