edit on dev branch
update branch again to merge
merged file
update conflict file
Delete file1
Delete file2
Merge pull request #3 from ryanwyu/dev

Uprev the Dev branch
Delete the two dummy files