fix merge error
fix a couple more typos