Fixed post page to not have two copies

Deleted merge commit artifacts

Fixed a bug introduced in the merge that the post pages had two copies of every post displayed.