mixed master and branch