aristocrat merge fixed
no change