resolve conflict on translation