The journey of two branches: from fast-forward to conflict