Improved error location detection
merger
updater
Improved error location
auto-merge staging into master