test conflic
Merge pull request #3 from tuan1192/history-task-test

test history task