Navigating Conflict: Portfolio Discipline Historically Wins