finished syncing cole's branch on john's computer

for real