edited file2 in branch1
Merge branch 'master' into branch1
edited file2 in branch1 after a merge with master
edited file2 in branch1 after a merge with master, deleted line 1
added file5
edited file2 in master
hopefully resolved all conflicts