fix OUYA control
merge conflict