fixes specs
works on feature specs
Fixes merges