Fix conflig
Merge pull request #12 from nguyen-phuoc-mulodo/task1

edit task.txt on task1