Merge master and local branch / add cleanup function