delete one function
delete the other a function
Merge branch 'oneTest'
Merge branch 'twoTest'