fix hello prob
merge