develop file2 line1
master file3, file2/line2
Merge branch 'develop'