Fixed compile error due to bad merge