Fixed cucumber stuff that merging broke.