{first}
second
Merge remote branch 'origin/Avtor'

Conflicts:
	login.php