make readme more readable
fix merge error