Merging Services concept into master