fix merge error at merging upstream