Compilation fixed after merge