changes introduced
introduced a new change in master
capitalized a
capitalized s
file1 after merge