merged diet branch