fix merge conflict of last merge