deploy fixes
merge