cancel works properly now.  forgot to check that
Merge remote-tracking branch 'origin'