updates to posts
fixed conflicts