Remote Control Code : fix merge Conflict