fix tranlastion clonflict