translation to english
resolved conflicts