id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
1	Implement conflict marking	igloo		"Implement conflict marking. Needs some design work first.
"	defect	new	blocker	0.1	camp	0.1