Merging baseShell with Master