Fixed merge conflicts
Fixed merge conflict with post.css