Sync both branches