Adding some comments.
resolving merge conflicts.