deleted file1.txt
combined commit
conflict added
conflict1
added file4.txt to new branch
merge2