changes made to transaction confirmation
Merge remote-tracking branch 'origin/master'