yet another hopefully last try. must learn how to pull newer file versions, and to reconcile diffs