One of the main challenges facing the electricity sector worldwide is the design of efficient markets. In particular, the mechanisms used to solve regulatory conflicts are a crucial element of a regulatory regime and a major determinant of the risks borne by private investors. We use the Chilean experience to analyze the evolution of mechanisms for conflict resolution within the electricity sector. We propose a theoretical framework based on bargaining theory to explain the behavior of market agents. This methodological approach is used to explain the evolution of conflict resolution following the introduction of the Experts Panel in 2004, as well as to explain the reduction in the number of conflicts. The results can also be applied to other electricity markets, leading to future market design proposals and governance improvements.