Correcting discrepencies between local and remote versions