Modify in Yours
Add func2
Add func3
Merge confilts
rename
delete
Revert "delete"

This reverts commit 8df143e5e0f6369ae2f3f8514954ab31eea7569e.
add test1
add test2
change for review
Merge pull request #1 from TLLIU/My-

My Pull request