Second commit
Direct commit
Commit change in inner doc
Commit on branch1
Another commit on master
New folder
New folder
Merge branch 'branch1'
Commit after conflict resolved
Merge branch 'origin/master'

everts commit eb5356383ce9a71abcc2987d8058da6a557aa78f.

Conflicts:
	New Folder/Doc_in_inner_folder.txt