Changed first line
Resolved the conflict