addpostview controller finished
merge conflict resolved