[DF-4721] fix QuickEd after merge