file1
data
timer
Merge branch 'branch1' into branch2
Merge remote-tracking branch 'origin/branch2'