conflict-resolution-demo

<<<<<<< HEAD This content was added locally

This change was made directly on github

b0dd586b2f1cb21894d95e388b0d38ea388cde36