Merge the two branches so you have a starting point.

The two branches are the most recently updated, so merge them and start from here