Resolve merge conflicts
Resolve merge conflicts

cucumber/gherkin3,dirkrombauts/gherkin3,cucumber/gherkin3,pjlsergeant/gherkin,SabotageAndi/gherkin,cucumber/gherkin3,dirkrombauts/gherkin3,dirkrombauts/gherkin3,pjlsergeant/gherkin,SabotageAndi/gherkin,SabotageAndi/gherkin,Zearin/gherkin3,pjlsergeant/gherkin,cucumber/gherkin3,dirkrombauts/gherkin3,cucumber/gherkin3,cucumber/gherkin3,Zearin/gherkin3,Zearin/gherkin3,dirkrombauts/gherkin3,cucumber/gherkin3,Zearin/gherkin3,pjlsergeant/gherkin,SabotageAndi/gherkin,Zearin/gherkin3,pjlsergeant/gherkin,dirkrombauts/gherkin3,cucumber/gherkin3,pjlsergeant/gherkin,SabotageAndi/gherkin,pjlsergeant/gherkin,dirkrombauts/gherkin3,Zearin/gherkin3,Zearin/gherkin3,cucumber/gherkin3,SabotageAndi/gherkin,pjlsergeant/gherkin,SabotageAndi/gherkin,Zearin/gherkin3,SabotageAndi/gherkin,SabotageAndi/gherkin,pjlsergeant/gherkin,dirkrombauts/gherkin3