Add some comments.
Fix conflict.