subscription remedy
fixed conflicts