changed first line
changed last line
Merge branch 'second'