added a workaround recommended by circleci to fix git version conflict