file1 ola
file1 hoi

Conflicts:
	file1