github desktop there are unresolved conflictsgithub desktop there are unresolved conflicts

• 自然言語
• 数学入力