Add check for remoting to decide whether to merge or save