resolved conflict in translate