Update exaple article
resolving conflicts