update master
fix merge conflicts