reconcile remote with my current local tree; overlays and finishing touches