fixed merged of WP plugin