hi tom
fixed hi tom merge conflict