resolved a conflict
all cucumber tests pass iteration 1-1