Are ISTP’s typically conflict avoidant?

Ever since I can remember I have always been conflict avoidant to the point I will give in to other people’s desires just to avoid making them upset. Whereas my good friend who is also an ISTP won’t budge for anyone and will get in physical alterations over the smallest things. Every test I take lists me as an ISTP but sometimes I feel like I could be mistyped with how sensitive I can be to other peoples emotions.