add a new file
add a new line in master
add a new line in testing
solve the conflict