improved debuggability
auto-merge staging into master