adding example
fixing merge conflict