fixed merge conflict with readme