fixes #6395 merge tag UI conflict