del log
fix merge conflicts