refactor servier side position model and controller
fix conflict