added function text to branch
function two
fixed the merge