merge base to main solution. ninja support.