Now the real conflict.

Hope it can be solved.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Conflict File 1.txt

IT WORKS!!!