rimote kesitai
conflict fixed