fix spec
merge