Comments added
Resolved conflict