adding logs
fix merge