resolved master branch discrepancy