services post type and editor plugin add
merge conflict