second commit on master
modified file2 on master
this should conflict
merged master into work