get method fixed
Translation merge conflict fix