Fix odd merge failure