log fix
fix merge