changed 1st line, commit in master
changed last line in file, commit in branch 'other'