When we talk about altruism in evolutionary terms are we talking about only the first definition?

1. Instinctive cooperative behavior that is detrimental to the individual but contributes to the survival of the species.

2. Unselfish concern for the welfare of others; selflessness.

One seems to be an instinctive action, the other is a conscious action.

Am I wrong in thinking there is a difference for the purposes of this debate?

Blacknad.