fixed wp-markdown merges