Fixing regression of promise reconciliation; correcting implementation
Merge pull request #197 from avoidwork/edge

Minor fixes