Change die to live
Merge remote-tracking branch 'origin/feature1'