branch 1

branch 1
emergency  br

emergency br test
the 2th emergency

the 2th emergency in the master, which will be modify by branch 1, to
test how to deal the conflict
branch 1 modify the master

branch 1 modify the master will make a conflict with the 2th emergency,
can it merge ? if can't then how to deal the conflict?
branch 1 modify the master

branch 1 modify the master will make a conflict with the 2th emergency,
can it e