Fixed broken build due to a bad merge