fix conflicts
Merge branch 'master' of https://github.com/toray/torayUtils-lib