[timeshift] merge remote from openatv/enigma2