added translate
solved conflicts