fix merge issue
fix merge issues