fixed conflict version due to pull request