fix sporadically failing spec
fixed merge conflict [skip ci]