adding the posibility to edit posts
manual merge