finish resolving conflicts
Merge pull request #84 from caskdata/feature/finish-merge

finishing resolving conflicts