Re: Avoiding file conflicts with multi-flavor builds