"Modern conflict theory[edit]
Modern conflict theory, a variation of ego psychology, is a revised version of structural theory, most notably different by altering concepts related to where repressed thoughts were stored(Freud, 1923, 1926). Modern conflict theory centers around how emotional symptoms and character traits are complex solutions to mental conflict.[40] It dispenses with the concepts of a fixed id, ego and superego, and instead posits conscious and unconscious conflict among wishes (dependent, controlling, sexual, and aggressive), guilt and shame, emotions (especially anxiety and depressive affect), and defensive operations that shut off from consciousness some aspect of the others. Moreover, healthy functioning (adaptive) is also determined, to a great extent, by resolutions of conflict.
A major objective of modern conflict-theory psychoanalysis is to change the balance of conflict in a patient by making aspects of the less adaptive solutions (also called "compromise formations") conscious so that they can be rethought, and more adaptive solutions found. Current theoreticians following Brenner's many suggestions (see especially Brenner's 1982 book, The Mind in Conflict) include Sandor Abend, MD (Abend, Porder, & Willick, (1983), Borderline Patients: Clinical Perspectives), Jacob Arlow (Arlow and Brenner (1964), Psychoanalytic Concepts and the Structural Theory), and Jerome Blackman (2003), 101 Defenses: How the Mind Shields Itself."
From Wiki on Psychoanalysis.