[sprint 6] sort merges by clans special sorting, ui form rework