data posting working
fixed conflicts