Fix bug with merges just before branches