Changed: $i = 'D';
Finish D

Conflicts:
	test-conflicts.php