The approval and adoption of the State Water Plan do not repeal any of the provisions of the Central Valley Project Act of 1933, and to the extent there may be any inconsistency or conflict, the provisions of Part 3 of this division shall prevail over the provisions of this part and of the State Water Plan.