fix conflicts with master branch ci