second_file should encounter a merge conflict when the new branch tries to merge into the master branch.