Added Comment box
Resolved conflicts