Add line3 in master
Solved conflict