new text in master not in branch
commit before merge
the big merge after conflicts resolved