added hello
merge fixed