fixed merge conflict

fixes gh-12