Hopefully resolve the compilation and conflict issues caused by that last merge