Added Line 2
Resolved conflicts