4.6 How to handle multiple branches correctly?