change make assess
fix merge confict