Changed to French
Resolved conflict