aries: fix merge error