Fixed deleting posts to work
Fixed merge conflict