Merging changes from Wordpress