line3
[merge] remove line2, add line3