According to Osho, the urge to fight isn't an obstacle if it's not a fixed identity. A true disciple is fluid like water - sometimes a warrior, sometimes meditative - responding to the moment without rigid 'oughts.' Discipline means freedom from patterns. Use the fighting energy only when the situation calls for it, then let it go and flow on.
It's okay to fight when it's really needed, but don't make fighting who you are; be like water and do what fits the moment.