Fix typos.
Fix conflict.