removed frantic branding
fixed conflict