Fix Build from merge