Fix make pch in the merged build