solve base merge again

3 jobs for master
latest