Merge in 'cowpatty'.