resolved conflicts in file
fixed

Conflicts:
	new.html