fix variable declation
merge fixes