resolve conflict
Add file2
add file3
commit file4
add content to file4
add file5