Handle multiple branches

|Anthony| <3