id	summary	reporter	owner	description	type	status	priority	milestone	component	version	resolution	keywords	cc
9780	resolving conflicts while merging ways doesn't work on first click	malenki	team	"When a user tries to merge two ways with two different values for one tag, the conflict resolving dialogue appears. It offers a drop-down list for the conflicting values.
If the user selects one of the conflicting values, the tag with the conflict is still marked with the red dot on the left side instead with a green dot for a tag with one value. 
The [Apply]-Button is not available
When the user clicks on the tag field or elsewhere on tags/values the dot becomes green and the [Apply]-button gets activated.

Desired behaviour:
Setting a value for the tag should set the tag to ""fixed"" (and a green dot) as well as activating the [Apply]-button."	defect	closed	normal		Core		duplicate