added a "finally" function that triggers no matter what
Merge remote-tracking branch 'origin/master'