changed b.txt on third branch
changed b.txt on master branch
committing resolution