add file feature4
line 1
line feature4.1
line feature4.1.1
edit file 0 again
Merge commit '408ead34011f7163e5932a0c13fdc0a84f279279'

Conflicts:
	file0.txt