a branch file
sth old
new new new
old old old
sth merged