Fixed broken specs
Fixed merge