Add hello function
fixed conflict
fixed