adds example merge conflict to readme