Add check to ensure merge in editors is performed only in remoting