merge conflicts fix

3 jobs for master
latest