new version of code browser example
resolving conflict