Compilation failure after the merge