merges both branches