When is the next transactional branch merge likely? I just tried to merge it myself, but there were many more conflicts than I had expected.