fixes build
merge