learning language style
fix merge