Added comment
Resolved conflicts