Add: ConflictsResolver window
Specialization and group rename improved
UX improvement