merge remote from openatv and openvix