reconciling local copies with master changes