haha
conf

Conflicts:
	lol.txt