add a get method
fix conflict