fix log
Merge branch 'master' of github.com:adrn/StreamMorphology
Merge branch 'master' of github.com:adrn/StreamMorphology
Merge branch 'master' of github.com:adrn/StreamMorphology
Merge branch 'master' of github.com:adrn/StreamMorphology
Merge branch 'master' of github.com:adrn/StreamMorphology
merge conflict