add a conflicting change
Merge branch 'master' of github.com:dtenenbaum/gitsvntest0