added case-4 to hello
fix conflicts