Most likely, since both branches have changes in the code, there will be some merge conflict when they are combined, and a person familiar with the change sets can resolve them to be correct.  However, we can worry about that later: i.e., once one branch is merged into master, then master can get merged into the other open branches and conflicts resolved.