Re-based branch