update d master
fix merge conflict