Ah, I misunderstood and thought the two branches were not going to be merged. In that case you are looking for something like this.