file 2
solve the conflict