Resolves merge conflict in SpecRunner