Not allowed empty input: disabled (\n), read strem till not empty string
Change echo for conflict in merge
Merge branch 'conflictbranch' and fix conflict

Conflicts:
	index.php