Forking and breaking with upstream