fixed xbox-controller
fixed merge