Fix merge issue that's killing compile