merge before renaming branches