merge remote from openatv