id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
1582	Highlight differences in conflict resolution window	dstillman	dstillman	http://forums.zotero.org/discussion/8806/	enhancement	new	minor		interface