Get and post subscription working
fixed conflicts