Change hello to hi
Solve conflict