deal with only one of branch.b.remote or branch.b.merge being defined