Who promoted the idea that there's a conflict between the conscious and unconscious mind?

A. Ernest Hemingway
B. Werner Heisenberg
C. Edgar Degas
D. Sigmund Freud