marketing sentence changed
fixed conflicts