Evolutionary and differential psychology: conceptual conflicts and the path to integration