[skeleton] Merging local/update to origin