merge local and remote repos