Code

pull, rebase: simplify to use die()