Edit file 1 & 2
fix conflict
add folder to test conflict
Merge pull request #3 from nguyen-phuoc-mulodo/branch#1

add folder to test conflict
fix conflict