add line4 in master
Add line5 in new
Solved conflict