add second line
add second line and fix conflicts