merge of changes in wordpress