fix grammar error.
Fix conflicts. Merge.