cleanup dh
cleanup merged
merge conflict resolved"
Merge pull request #3 from dhfromkorea/dev

collaborative cleanup