grammar fixes
address issues raised by Tres Seaver at #884
Resolve conflict.