updated remote controllers
fixed merge conflict