first merge conflict

3 jobs for master