added content to both in the differing article
Merge branch 'master' into 'wpf' resolved merge conflict