add new controller
merge conflix