resolve merge conflict with background-jobs branch