cause conflict?
new file added from branch3
Merge pull request #2 from tkureha/branch3

Branch3 - cause conflict and new file added