Merging changes with WP production