also modified first line
Resolve conflicts