Resolve compilation error due to merge