Fix compile problem caused by bad merge