Do not show conflict resolved dialog from TMerge