file 4 line2
file 5 line2
fixed merge conflict