fix compilation failure after merge