translation methods
fix conflicts