syntax fixes
merge