new commit new branch
commit 3
dev2
Merge pull request #1 from duyanhupsigndown/function1

Conflict