Avoiding the compilation error due to merge