Sync guides with upstream