fix issues
fix merge