mm
tt
mmm
merge
s
2
1
Merge branch 's'
t
master
confilict