another grammar tweak.
another grammar nit
fix typo
another nit
fix tiny conflict