The Philosophy of Psychology

What is the relationship between common-sense, or 'folk', psychology and contemporary scientific psychology? Are they in conflict with one another? Or do they perform quite different, though perhaps complementary, roles? George Botterill...