Create file004
Merge branch 'Dev' of https://github.com/nk-chenfeng/test_repo
Add file005
Do some changes
Merge branch 'Dev' into test_branch
Merge branch 'test_branch' of https://github.com/nk-chenfeng/test_repo into test_branch

Conflicts:
	file001