[telegram-desktop/f38] (2 commits) ...Fix conflict.