Fix merging conlfict
Fix merging conlfict

locomotivemtl/wordpress-chimplet,jonathanbardo/WP-Chimplet,jonathanbardo/WP-Chimplet,locomotivemtl/wordpress-chimplet,jonathanbardo/WP-Chimplet,locomotivemtl/wordpress-chimplet