fixed merge conflict #47

Closed selenax closed 6 years ago