Add line4 in dev branch
Solved conflict