resolve pr conflicts in github desktopresolve pr conflicts in github desktop

• 自然言語
• 数学入力