my version of second line
fixed conflicts