Manual Sync

Git wins every time.