conda: use new branch (revert this after merge)