Merged diet branch