Merge conflict resolution
conflict resolution.
Merge branch 'master' of github.com:nalrun/cs