merge locale changes