id	Summary	Status	Keywords	Owner	Type	Priority
6980	no horizonzal scrollbars in conflict resolution	new	scrolling conflict scrollbar	team	defect	normal