add comment line locally, attempting to force a merge conflict
Merge branch 'master' of github.com:444c43/.NetExtensions