Removing die syntax
Merge origin/master