debug glyhps
resolve conflicts

Conflicts:
	app/views/single.html