Merging Logic with Master