Fixed |disconnect| edge case
auto-merge staging into master