Merging back and forth

Between the Eclipse laptop and the Aide phone