hzhao added a line
test if merged
Merge branch 'hzhao-master'