Change language to english
Solved conflicts