Fix merge markers, make recursive call more functional, assume callbacks can be async and treat as such
Fix merge markers, make recursive call more functional, assume callbacks can be async and treat as such

glimpseio/glacier,glimpseio/glacier,glimpseio/glacier