There have been many studies, Biological Opinions, and operating plans over recent years, all of which have been controversial. The events of 2001 and 2002 prompted renewed efforts to resolve water conflicts in the Klamath Basin. Congress has responded to the controversy in a number of ways, including holding oversight hearings and appropriating funds for activities in the area. This report provides an overview of recent conflict in the Klamath Basin, with an emphasis on activities in the Upper Basin, and summarizes some of the activities taking place to improve water supply reliability and fish survival.