resolve merge conflicts github web editorresolve merge conflicts github web editor

• 自然言語
• 数学入力