Delete obsolete files
merge command-bar
merge master