added section in posts
fixed conflicts in merge
fixed some errors