Open Graph: add WP SEO back to conflicts

Merges in e86db2ed4900d3cd68277679457fc9b238ace683