fix issues
fix merge issue