can die
Merge branch 'die'