rename controller
rename controller
fix conflict